Skip to content

Commit e309ba5

Browse files
archana25-msarchana25-ms
authored
Upgrade: jimtcl version to 0.83 (#13771)
1 parent 4ebc2ba commit e309ba5

5 files changed

Lines changed: 152 additions & 80 deletions

File tree

‎SPECS-EXTENDED/jimtcl/jimtcl-fix_doc_paths.patch‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎SPECS-EXTENDED/jimtcl/jimtcl-stdio-for-readline.diff‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 35e0e1f9b1f018666e5170a35366c5fc3b97309c Mon Sep 17 00:00:00 2001
2+
From: Steve Bennett <steveb@workware.net.au>
3+
Date: Thu, 29 Aug 2024 08:25:11 +1000
4+
Subject: [PATCH] readline: work around buggy readline.h
5+
6+
Some versions don't included needed stdio.h
7+
8+
Fixes: #308
9+
10+
Signed-off-by: Steve Bennett <steveb@workware.net.au>
11+
---
12+
jim-readline.c | 2 ++
13+
1 file changed, 2 insertions(+)
14+
15+
diff --git a/jim-readline.c b/jim-readline.c
16+
index 5715b2c9..c83e649b 100644
17+
--- a/jim-readline.c
18+
+++ b/jim-readline.c
19+
@@ -34,6 +34,8 @@
20+
21+
#include <jim.h>
22+
23+
+#include <stdio.h>
24+
+
25+
#include <readline/readline.h>
26+
#include <readline/history.h>
27+

‎SPECS-EXTENDED/jimtcl/jimtcl.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"jimtcl-0.78.tar.gz": "cf801795c9fd98bfff6882c14afdf96424ba86dead58c2a4e15978b176d3e12b"
3+
"jimtcl-0.83.tar.gz": "6f2df00009f5ac4ad654c1ae1d2f8ed18191de38d1f5a88a54ea99cc16936686"
44
}
55
}

‎SPECS-EXTENDED/jimtcl/jimtcl.spec‎

Lines changed: 122 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,169 @@
1+
%bcond_without tests
2+
13
Vendor: Microsoft Corporation
24
Distribution: Azure Linux
35
Name: jimtcl
4-
Version: 0.78
5-
Release: 5%{?dist}
6+
Version: 0.83
7+
Release: 3%{?dist}
68
Summary: A small embeddable Tcl interpreter
79

8-
License: BSD
10+
License: BSD-2-Clause-Views
911
URL: http://jim.tcl.tk
10-
Source0: https://github.com/msteveb/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
11-
Patch0: jimtcl-fix_doc_paths.patch
12+
Source: https://github.com/msteveb/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
13+
# readline expects applications to include stdio.h, jimtcl was not
14+
Patch: https://github.com/msteveb/jimtcl/commit/35e0e1f9b1f018666e5170a35366c5fc3b97309c.patch#/jimtcl-stdio-for-readline.diff
1215

13-
BuildRequires: gcc
16+
BuildRequires: gcc-c++
1417
BuildRequires: asciidoc
15-
16-
%description
17-
Jim is an opensource small-footprint implementation of the Tcl programming
18+
BuildRequires: make
19+
# Extension dependencies
20+
BuildRequires: pkgconfig(openssl)
21+
BuildRequires: pkgconfig(zlib)
22+
%if %{with tests}
23+
BuildRequires: hostname
24+
%endif
25+
26+
%global _description %{expand:
27+
Jim is an opensource small-footprint implementation of the Tcl programming
1828
language. It implements a large subset of Tcl and adds new features like
1929
references with garbage collection, closures, built-in Object Oriented
2030
Programming system, Functional Programming commands, first-class arrays and
21-
UTF-8 support.
31+
UTF-8 support.}
32+
33+
%description %{_description}
34+
2235

2336
%package devel
2437
Summary: Development files for %{name}
2538
Requires: %{name}%{?_isa} = %{version}-%{release}
2639

27-
%description devel
40+
%description devel %{_description}
41+
2842
The %{name}-devel package contains libraries and header files for
2943
developing applications that use %{name}.
3044

31-
%prep
32-
%setup -q
33-
%patch 0
3445

46+
%prep
47+
%autosetup
3548
rm -rf sqlite3
3649

3750
%build
3851
#configure is not able to locate the needed binaries, so specify it manualy
39-
export CC=gcc
40-
export LD=ld
52+
# export CC=gcc
53+
# export LD=ld
4154
export AR=ar
4255
export RANLIB=ranlib
4356
export STRIP=strip
4457

45-
%configure --full --shared --disable-option-checking
46-
make %{?_smp_mflags}
58+
# compile extensions that are disabled by default
59+
# as modules
60+
# see ./configure --extinfo for list
61+
%configure --shared --disable-option-checking \
62+
--allextmod \
63+
%ifarch s390x # zlib test fails on s390x
64+
--without-ext=zlib \
65+
%endif
66+
--docdir=%{_datadir}/doc/%{name}
67+
%make_build
4768

48-
%check
49-
make test
5069

5170
%install
52-
%make_install
53-
rm -rf %{buildroot}/%{_datadir}/doc/%{name}
54-
rm -rf %{buildroot}/%{_libdir}/jim/tcltest.tcl
55-
pushd %{buildroot}/%{_libdir}/
56-
ln -s libjim.so.* libjim.so
57-
popd
71+
%make_install INSTALL_DOCS=nodocs
72+
rm %{buildroot}/%{_libdir}/jim/README.extensions
73+
74+
75+
%if %{with tests}
76+
%check
77+
# remove tests that require network access
78+
rm tests/ssl.test
79+
make test
80+
%endif
5881

59-
%ldconfig_scriptlets
6082

6183
%files
62-
%doc LICENSE AUTHORS README Tcl.html
84+
%license LICENSE
85+
%doc AUTHORS README README.*
86+
%doc EastAsianWidth.txt
87+
%doc %{_datadir}/doc/%{name}/Tcl.html
88+
%{_bindir}/jimdb
6389
%{_bindir}/jimsh
90+
%dir %{_libdir}/jim
91+
%{_libdir}/jim/*.tcl
92+
%{_libdir}/jim/*.so
6493
%{_libdir}/libjim.so.*
6594

95+
6696
%files devel
67-
%doc DEVELOPING README.extensions README.metakit README.namespaces README.oo README.utf-8 STYLE
97+
%doc CONTRIBUTING.md STYLE
6898
%{_includedir}/*
6999
%{_bindir}/build-jim-ext
70100
%{_libdir}/libjim.so
71101
%{_libdir}/pkgconfig/jimtcl.pc
72102

73103
%changelog
74-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.78-5
75-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
104+
* Mon May 12 2025 Archana Shettigar <v-shettigara@microsoft.com> - 0.83-3
105+
- Initial Azure Linux import from Fedora 42 (license: MIT).
106+
- License verified
107+
108+
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.83-2
109+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
110+
111+
* Fri Sep 20 2024 Michel Lind <salimma@fedoraproject.org> - 0.83-1
112+
- Update to version 0.83; Fixes: RHBZ#2309077
113+
114+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.82-6
115+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
116+
117+
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.82-5
118+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
119+
120+
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.82-4
121+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
122+
123+
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.82-3
124+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
125+
126+
* Tue Feb 28 2023 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.82-2
127+
- Properly disable zlib extension on s390x
128+
- move README files meant for programming with jimtcl to main package
129+
130+
* Tue Feb 28 2023 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.82-1
131+
- Update to 0.82
132+
- enable more extensions
133+
- update license to use SPDX
134+
135+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.81-5
136+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
137+
138+
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.81-4
139+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
140+
141+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.81-3
142+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
143+
144+
* Fri Jan 07 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.81-2
145+
- Disable zlib module on s390x (tests fail)
146+
147+
* Fri Jan 07 2022 Michel Alexandre Salim <salimma@fedoraproject.org> - 0.81-1
148+
- Update to 0.81
149+
- Ship extensions that are disabled by default as modules
150+
- Opt in to rpmautospec
151+
152+
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-9
153+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
154+
155+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-8
156+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
157+
158+
* Thu Aug 06 2020 Jeff Law <law@redhat.com> - 0.78-6
159+
- Depend on g++
160+
161+
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-6
162+
- Second attempt - Rebuilt for
163+
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
164+
165+
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-5
166+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
76167

77168
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-4
78169
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
@@ -153,4 +244,3 @@ popd
153244

154245
* Sun May 05 2013 Markus Mayer <lotharlutz@gmx.de> - 0.73-1
155246
- inital prm release
156-

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7931,8 +7931,8 @@
79317931
"type": "other",
79327932
"other": {
79337933
"name": "jimtcl",
7934-
"version": "0.78",
7935-
"downloadUrl": "https://github.com/msteveb/jimtcl/archive/0.78/jimtcl-0.78.tar.gz"
7934+
"version": "0.83",
7935+
"downloadUrl": "https://github.com/msteveb/jimtcl/archive/0.83/jimtcl-0.83.tar.gz"
79367936
}
79377937
}
79387938
},

0 commit comments

Comments
 (0)