From 18962ededd0de39b959aa1a478787eaceb4874f3 Mon Sep 17 00:00:00 2001 From: archana25-ms Date: Mon, 12 May 2025 23:07:28 +0000 Subject: [PATCH 1/2] Upgrade: jimtcl version to 0.81 --- .../jimtcl/jimtcl-fix_doc_paths.patch | 45 ------- SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch | 42 +++++++ SPECS-EXTENDED/jimtcl/jimtcl.signatures.json | 2 +- SPECS-EXTENDED/jimtcl/jimtcl.spec | 118 ++++++++++++++---- cgmanifest.json | 4 +- 5 files changed, 138 insertions(+), 73 deletions(-) delete mode 100644 SPECS-EXTENDED/jimtcl/jimtcl-fix_doc_paths.patch create mode 100644 SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch diff --git a/SPECS-EXTENDED/jimtcl/jimtcl-fix_doc_paths.patch b/SPECS-EXTENDED/jimtcl/jimtcl-fix_doc_paths.patch deleted file mode 100644 index 3c55606bcc6..00000000000 --- a/SPECS-EXTENDED/jimtcl/jimtcl-fix_doc_paths.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git Makefile.in Makefile.in -index 51435c1..c2cff43 100644 ---- Makefile.in -+++ Makefile.in -@@ -99,7 +99,7 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o - install: all @TCL_EXTS@ install-exec install-docs - $(INSTALL_DATA_DIR) $(DESTDIR)@libdir@/jim - $(INSTALL_DATA) $(LIBJIM) $(DESTDIR)@libdir@ -- $(INSTALL_DATA) @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)@libdir@/jim -+ $(INSTALL_DATA) @srcdir@/README.extensions @C_EXT_SHOBJS@ $(DESTDIR)@datadir@/doc/jimtcl - for i in tcltest.tcl @TCL_EXTS@; do $(INSTALL_DATA) @srcdir@/$$i $(DESTDIR)@libdir@/jim; done - $(INSTALL_DATA_DIR) $(DESTDIR)@includedir@ - $(INSTALL_DATA) @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \ -@@ -118,9 +118,9 @@ uninstall: - rm -f $(DESTDIR)@bindir@/$(JIMSH) - rm -f $(DESTDIR)@bindir@/build-jim-ext - rm -f $(DESTDIR)@libdir@/$(LIBJIM) -- for i in README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@; do rm -f $(DESTDIR)@libdir@/jim/$$i; done -+ for i in README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@; do rm -f $(DESTDIR)@datadir@/doc/jimtcl/$$i; done - rm -f $(DESTDIR)@includedir@/jim*.h -- rm -f $(DESTDIR)@datadir@/doc/jim/Tcl.html -+ rm -f $(DESTDIR)@datadir@/doc/jimtcl/Tcl.html - @else - install install-exec: all - uninstall: -@@ -259,15 +259,15 @@ install-docs: - - @if INSTALL_DOCS == docs - install-docs: docs -- $(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) -- $(INSTALL_DATA) Tcl.html $(DESTDIR)$(docdir) -+ $(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/doc/jimtcl -+ $(INSTALL_DATA) Tcl.html $(DESTDIR)@datadir@/doc/jimtcl - @endif - - @if INSTALL_DOCS == shipped - install-docs: -- $(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) -+ $(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/doc/jimtcl - @echo "Warning: asciidoc not available - installing Tcl_shipped.html" -- $(INSTALL_DATA) Tcl_shipped.html $(DESTDIR)$(docdir)/Tcl.html -+ $(INSTALL_DATA) Tcl_shipped.html $(DESTDIR)@datadir@/doc/jimtcl/Tcl.html - @endif - - Tcl.html: jim_tcl.txt @srcdir@/make-index diff --git a/SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch b/SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch new file mode 100644 index 00000000000..521c7d8aabe --- /dev/null +++ b/SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch @@ -0,0 +1,42 @@ +diff -ruN jimtcl-0.81/auto.def jimtcl-lib64/auto.def +--- jimtcl-0.81/auto.def 2021-11-27 15:06:54.000000000 -0800 ++++ jimtcl-lib64/auto.def 2022-01-07 12:05:53.769713328 -0800 +@@ -271,7 +271,7 @@ + cc-check-lfs + cc-check-functions fseeko ftello + +-define TCL_LIBRARY [get-define prefix]/lib/jim ++define TCL_LIBRARY [get-define libdir]/jim + + lassign [split [get-define host] -] host_cpu host_vendor host_os + # Scrub revision from the host_os +@@ -445,7 +445,7 @@ + } + define VERSION [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]] + define LIBSOEXT [format [get-define SH_SOEXTVER] [get-define VERSION]] +-if {[get-define libdir] ni {/lib /usr/lib}} { ++if {[get-define libdir] ni {/lib /usr/lib /usr/lib64}} { + define SH_LINKRPATH_FLAGS [format [get-define SH_LINKRPATH] [get-define libdir]] + } else { + define SH_LINKRPATH_FLAGS "" +diff -ruN jimtcl-0.81/build-jim-ext.in jimtcl-lib64/build-jim-ext.in +--- jimtcl-0.81/build-jim-ext.in 2021-11-27 15:06:54.000000000 -0800 ++++ jimtcl-lib64/build-jim-ext.in 2022-01-07 12:07:18.397171096 -0800 +@@ -41,7 +41,7 @@ + set cross 1 + } + --install { +- # Install to $DESTDIR/@prefix@/lib/jim ++ # Install to $DESTDIR/@libdir@/jim + set install 1 + } + --static { +@@ -225,7 +225,7 @@ + load ./$target + } + if {$install} { +- set dest [env DESTDIR ""]@prefix@/lib/jim ++ set dest [env DESTDIR ""]@libdir@/jim + puts "Install: $target => $dest" + file mkdir $dest + file copy $target $dest/$target diff --git a/SPECS-EXTENDED/jimtcl/jimtcl.signatures.json b/SPECS-EXTENDED/jimtcl/jimtcl.signatures.json index a5edb52922d..67a30090e0d 100644 --- a/SPECS-EXTENDED/jimtcl/jimtcl.signatures.json +++ b/SPECS-EXTENDED/jimtcl/jimtcl.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "jimtcl-0.78.tar.gz": "cf801795c9fd98bfff6882c14afdf96424ba86dead58c2a4e15978b176d3e12b" + "jimtcl-0.81.tar.gz": "ab7eb3680ba0d16f4a9eb1e05b7fcbb7d23438e25185462c55cd032a1954a985" } } diff --git a/SPECS-EXTENDED/jimtcl/jimtcl.spec b/SPECS-EXTENDED/jimtcl/jimtcl.spec index a9e85f20551..fb518753b74 100644 --- a/SPECS-EXTENDED/jimtcl/jimtcl.spec +++ b/SPECS-EXTENDED/jimtcl/jimtcl.spec @@ -1,68 +1,101 @@ +%bcond_without tests + Vendor: Microsoft Corporation Distribution: Azure Linux Name: jimtcl -Version: 0.78 -Release: 5%{?dist} +Version: 0.81 +Release: 6%{?dist} Summary: A small embeddable Tcl interpreter License: BSD URL: http://jim.tcl.tk Source0: https://github.com/msteveb/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: jimtcl-fix_doc_paths.patch +# support using lib64 instead of lib +Patch0: %{name}-lib64.patch -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: asciidoc - -%description -Jim is an opensource small-footprint implementation of the Tcl programming +BuildRequires: make +# Extension dependencies +BuildRequires: pkgconfig(openssl) +%ifnarch s390x +# zlib test fails on s390x +BuildRequires: pkgconfig(zlib) +%endif +%if %{with tests} +BuildRequires: hostname +%endif + +%global _description %{expand: +Jim is an opensource small-footprint implementation of the Tcl programming language. It implements a large subset of Tcl and adds new features like references with garbage collection, closures, built-in Object Oriented Programming system, Functional Programming commands, first-class arrays and -UTF-8 support. +UTF-8 support.} + +%description %{_description} + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -%description devel +%description devel %{_description} + The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%prep -%setup -q -%patch 0 +%prep +%autosetup -p1 rm -rf sqlite3 %build #configure is not able to locate the needed binaries, so specify it manualy -export CC=gcc -export LD=ld +# export CC=gcc +# export LD=ld export AR=ar export RANLIB=ranlib export STRIP=strip -%configure --full --shared --disable-option-checking -make %{?_smp_mflags} +# compile extensions that are disabled by default +# as modules +# see ./configure --extinfo for list +%configure --shared --disable-option-checking \ + --allextmod \ + --docdir=%{_datadir}/doc/%{name} \ +# make %{?_smp_mflags} +%make_build -%check -make test %install -%make_install -rm -rf %{buildroot}/%{_datadir}/doc/%{name} -rm -rf %{buildroot}/%{_libdir}/jim/tcltest.tcl +%make_install INSTALL_DOCS=nodocs +rm %{buildroot}/%{_libdir}/jim/README.extensions pushd %{buildroot}/%{_libdir}/ ln -s libjim.so.* libjim.so popd -%ldconfig_scriptlets + +%if %{with tests} +%check +# remove tests that require network access +rm tests/ssl.test +make test +%endif + %files -%doc LICENSE AUTHORS README Tcl.html +%license LICENSE +%doc AUTHORS README +%doc %{_datadir}/doc/%{name}/Tcl.html +%{_bindir}/jimdb %{_bindir}/jimsh +%dir %{_libdir}/jim +%{_libdir}/jim/*.tcl +%{_libdir}/jim/*.so %{_libdir}/libjim.so.* + %files devel %doc DEVELOPING README.extensions README.metakit README.namespaces README.oo README.utf-8 STYLE %{_includedir}/* @@ -71,8 +104,42 @@ popd %{_libdir}/pkgconfig/jimtcl.pc %changelog -* Fri Oct 15 2021 Pawel Winogrodzki - 0.78-5 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). +* Mon May 12 2025 Archana Shettigar - 0.81-6 +- Initial Azure Linux import from Fedora 38 (license: MIT). +- License verified + +* Thu Jan 19 2023 Fedora Release Engineering - 0.81-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.81-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.81-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jan 07 2022 Michel Alexandre Salim - 0.81-2 +- Disable zlib module on s390x (tests fail) + +* Fri Jan 07 2022 Michel Alexandre Salim - 0.81-1 +- Update to 0.81 +- Ship extensions that are disabled by default as modules +- Opt in to rpmautospec + +* Thu Jul 22 2021 Fedora Release Engineering - 0.78-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.78-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Aug 06 2020 Jeff Law - 0.78-6 +- Depend on g++ + +* Sat Aug 01 2020 Fedora Release Engineering - 0.78-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.78-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild * Wed Jan 29 2020 Fedora Release Engineering - 0.78-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild @@ -154,3 +221,4 @@ popd * Sun May 05 2013 Markus Mayer - 0.73-1 - inital prm release + diff --git a/cgmanifest.json b/cgmanifest.json index ff907a965b8..203a5b9d531 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -7931,8 +7931,8 @@ "type": "other", "other": { "name": "jimtcl", - "version": "0.78", - "downloadUrl": "https://github.com/msteveb/jimtcl/archive/0.78/jimtcl-0.78.tar.gz" + "version": "0.81", + "downloadUrl": "https://github.com/msteveb/jimtcl/archive/0.81/jimtcl-0.81.tar.gz" } } }, From 27b763d01230fd5ef8da826120ef2c0c6859983b Mon Sep 17 00:00:00 2001 From: archana25-ms Date: Wed, 14 May 2025 06:08:06 +0000 Subject: [PATCH 2/2] Upgrade: jimtcl version to 0.83 --- SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch | 42 ------------ .../jimtcl/jimtcl-stdio-for-readline.diff | 27 ++++++++ SPECS-EXTENDED/jimtcl/jimtcl.signatures.json | 2 +- SPECS-EXTENDED/jimtcl/jimtcl.spec | 64 +++++++++++++------ cgmanifest.json | 4 +- 5 files changed, 73 insertions(+), 66 deletions(-) delete mode 100644 SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch create mode 100644 SPECS-EXTENDED/jimtcl/jimtcl-stdio-for-readline.diff diff --git a/SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch b/SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch deleted file mode 100644 index 521c7d8aabe..00000000000 --- a/SPECS-EXTENDED/jimtcl/jimtcl-lib64.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ruN jimtcl-0.81/auto.def jimtcl-lib64/auto.def ---- jimtcl-0.81/auto.def 2021-11-27 15:06:54.000000000 -0800 -+++ jimtcl-lib64/auto.def 2022-01-07 12:05:53.769713328 -0800 -@@ -271,7 +271,7 @@ - cc-check-lfs - cc-check-functions fseeko ftello - --define TCL_LIBRARY [get-define prefix]/lib/jim -+define TCL_LIBRARY [get-define libdir]/jim - - lassign [split [get-define host] -] host_cpu host_vendor host_os - # Scrub revision from the host_os -@@ -445,7 +445,7 @@ - } - define VERSION [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]] - define LIBSOEXT [format [get-define SH_SOEXTVER] [get-define VERSION]] --if {[get-define libdir] ni {/lib /usr/lib}} { -+if {[get-define libdir] ni {/lib /usr/lib /usr/lib64}} { - define SH_LINKRPATH_FLAGS [format [get-define SH_LINKRPATH] [get-define libdir]] - } else { - define SH_LINKRPATH_FLAGS "" -diff -ruN jimtcl-0.81/build-jim-ext.in jimtcl-lib64/build-jim-ext.in ---- jimtcl-0.81/build-jim-ext.in 2021-11-27 15:06:54.000000000 -0800 -+++ jimtcl-lib64/build-jim-ext.in 2022-01-07 12:07:18.397171096 -0800 -@@ -41,7 +41,7 @@ - set cross 1 - } - --install { -- # Install to $DESTDIR/@prefix@/lib/jim -+ # Install to $DESTDIR/@libdir@/jim - set install 1 - } - --static { -@@ -225,7 +225,7 @@ - load ./$target - } - if {$install} { -- set dest [env DESTDIR ""]@prefix@/lib/jim -+ set dest [env DESTDIR ""]@libdir@/jim - puts "Install: $target => $dest" - file mkdir $dest - file copy $target $dest/$target diff --git a/SPECS-EXTENDED/jimtcl/jimtcl-stdio-for-readline.diff b/SPECS-EXTENDED/jimtcl/jimtcl-stdio-for-readline.diff new file mode 100644 index 00000000000..1a32d4775f1 --- /dev/null +++ b/SPECS-EXTENDED/jimtcl/jimtcl-stdio-for-readline.diff @@ -0,0 +1,27 @@ +From 35e0e1f9b1f018666e5170a35366c5fc3b97309c Mon Sep 17 00:00:00 2001 +From: Steve Bennett +Date: Thu, 29 Aug 2024 08:25:11 +1000 +Subject: [PATCH] readline: work around buggy readline.h + +Some versions don't included needed stdio.h + +Fixes: #308 + +Signed-off-by: Steve Bennett +--- + jim-readline.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/jim-readline.c b/jim-readline.c +index 5715b2c9..c83e649b 100644 +--- a/jim-readline.c ++++ b/jim-readline.c +@@ -34,6 +34,8 @@ + + #include + ++#include ++ + #include + #include + diff --git a/SPECS-EXTENDED/jimtcl/jimtcl.signatures.json b/SPECS-EXTENDED/jimtcl/jimtcl.signatures.json index 67a30090e0d..d902feab585 100644 --- a/SPECS-EXTENDED/jimtcl/jimtcl.signatures.json +++ b/SPECS-EXTENDED/jimtcl/jimtcl.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "jimtcl-0.81.tar.gz": "ab7eb3680ba0d16f4a9eb1e05b7fcbb7d23438e25185462c55cd032a1954a985" + "jimtcl-0.83.tar.gz": "6f2df00009f5ac4ad654c1ae1d2f8ed18191de38d1f5a88a54ea99cc16936686" } } diff --git a/SPECS-EXTENDED/jimtcl/jimtcl.spec b/SPECS-EXTENDED/jimtcl/jimtcl.spec index fb518753b74..212636e0e85 100644 --- a/SPECS-EXTENDED/jimtcl/jimtcl.spec +++ b/SPECS-EXTENDED/jimtcl/jimtcl.spec @@ -3,25 +3,22 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: jimtcl -Version: 0.81 -Release: 6%{?dist} +Version: 0.83 +Release: 3%{?dist} Summary: A small embeddable Tcl interpreter -License: BSD +License: BSD-2-Clause-Views URL: http://jim.tcl.tk -Source0: https://github.com/msteveb/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -# support using lib64 instead of lib -Patch0: %{name}-lib64.patch +Source: https://github.com/msteveb/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +# readline expects applications to include stdio.h, jimtcl was not +Patch: https://github.com/msteveb/jimtcl/commit/35e0e1f9b1f018666e5170a35366c5fc3b97309c.patch#/jimtcl-stdio-for-readline.diff BuildRequires: gcc-c++ BuildRequires: asciidoc BuildRequires: make # Extension dependencies BuildRequires: pkgconfig(openssl) -%ifnarch s390x -# zlib test fails on s390x BuildRequires: pkgconfig(zlib) -%endif %if %{with tests} BuildRequires: hostname %endif @@ -47,7 +44,7 @@ developing applications that use %{name}. %prep -%autosetup -p1 +%autosetup rm -rf sqlite3 %build @@ -63,17 +60,16 @@ export STRIP=strip # see ./configure --extinfo for list %configure --shared --disable-option-checking \ --allextmod \ - --docdir=%{_datadir}/doc/%{name} \ -# make %{?_smp_mflags} +%ifarch s390x # zlib test fails on s390x + --without-ext=zlib \ +%endif + --docdir=%{_datadir}/doc/%{name} %make_build %install %make_install INSTALL_DOCS=nodocs rm %{buildroot}/%{_libdir}/jim/README.extensions -pushd %{buildroot}/%{_libdir}/ -ln -s libjim.so.* libjim.so -popd %if %{with tests} @@ -86,7 +82,8 @@ make test %files %license LICENSE -%doc AUTHORS README +%doc AUTHORS README README.* +%doc EastAsianWidth.txt %doc %{_datadir}/doc/%{name}/Tcl.html %{_bindir}/jimdb %{_bindir}/jimsh @@ -97,17 +94,44 @@ make test %files devel -%doc DEVELOPING README.extensions README.metakit README.namespaces README.oo README.utf-8 STYLE +%doc CONTRIBUTING.md STYLE %{_includedir}/* %{_bindir}/build-jim-ext %{_libdir}/libjim.so %{_libdir}/pkgconfig/jimtcl.pc %changelog -* Mon May 12 2025 Archana Shettigar - 0.81-6 -- Initial Azure Linux import from Fedora 38 (license: MIT). +* Mon May 12 2025 Archana Shettigar - 0.83-3 +- Initial Azure Linux import from Fedora 42 (license: MIT). - License verified +* Fri Jan 17 2025 Fedora Release Engineering - 0.83-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Sep 20 2024 Michel Lind - 0.83-1 +- Update to version 0.83; Fixes: RHBZ#2309077 + +* Thu Jul 18 2024 Fedora Release Engineering - 0.82-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 0.82-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 0.82-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.82-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Feb 28 2023 Michel Alexandre Salim - 0.82-2 +- Properly disable zlib extension on s390x +- move README files meant for programming with jimtcl to main package + +* Tue Feb 28 2023 Michel Alexandre Salim - 0.82-1 +- Update to 0.82 +- enable more extensions +- update license to use SPDX + * Thu Jan 19 2023 Fedora Release Engineering - 0.81-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild @@ -220,5 +244,3 @@ make test * Sun May 05 2013 Markus Mayer - 0.73-1 - inital prm release - - diff --git a/cgmanifest.json b/cgmanifest.json index 203a5b9d531..f97fb300760 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -7931,8 +7931,8 @@ "type": "other", "other": { "name": "jimtcl", - "version": "0.81", - "downloadUrl": "https://github.com/msteveb/jimtcl/archive/0.81/jimtcl-0.81.tar.gz" + "version": "0.83", + "downloadUrl": "https://github.com/msteveb/jimtcl/archive/0.83/jimtcl-0.83.tar.gz" } } },