Browse Source

updated 5 packages

expect-5.45.4-2

python3-3.11.13-1

sqlite3-3.50.1-1

tcl-8.6.16-1

tk-8.6.16-1
Tomohiro "Tomo-p" KATO 3 weeks ago
parent
commit
d9aec5776a
5 changed files with 109 additions and 131 deletions
  1. 25 19
      e/expect/expect-vl.spec
  2. 8 11
      p/python3/python3-vl.spec
  3. 23 30
      s/sqlite3/sqlite3-vl.spec
  4. 32 40
      t/tcl/tcl-vl.spec
  5. 21 31
      t/tk/tk-vl.spec

+ 25 - 19
e/expect/expect-vl.spec

@@ -8,12 +8,14 @@ Summary: A Tcl/Tk development environment: expect
 Summary(ja): Tcl/Tk 開発環境: expect
 Summary(ja): Tcl/Tk 開発環境: expect
 Name: expect
 Name: expect
 Version: %{majorver}.4
 Version: %{majorver}.4
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: Public Domain
 License: Public Domain
-Group: Development/Languages
 # URL: probably more useful is http://sourceforge.net/projects/expect/
 # URL: probably more useful is http://sourceforge.net/projects/expect/
 URL: https://core.tcl-lang.org/expect/index
 URL: https://core.tcl-lang.org/expect/index
-
 Source: https://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
 Source: https://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
 # Patch0: fixes change log file permissions
 # Patch0: fixes change log file permissions
 Patch0: expect-5.43.0-log_file.patch
 Patch0: expect-5.43.0-log_file.patch
@@ -50,17 +52,16 @@ Patch103: expect-5.45-passmass-su-full-path.patch
 Patch104: expect-5.45-mkpasswd-man.patch
 Patch104: expect-5.45-mkpasswd-man.patch
 # Patch105: Fix error with -Werror=format-security
 # Patch105: Fix error with -Werror=format-security
 Patch105: expect-5.45-format-security.patch
 Patch105: expect-5.45-format-security.patch
+Patch106: expect-configure-c99.patch
+Patch107: expect-c99.patch
 
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tk-devel >= %{tcl_major}
 BuildRequires: tk-devel >= %{tcl_major}
 BuildRequires: autoconf
 BuildRequires: autoconf
 BuildRequires: chrpath
 BuildRequires: chrpath
 BuildRequires: libX11-devel
 BuildRequires: libX11-devel
 BuildRequires: libXft-devel
 BuildRequires: libXft-devel
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description -n expect
 %description -n expect
 Expect is a tcl extension for automating interactive applications such
 Expect is a tcl extension for automating interactive applications such
 as telnet, ftp, passwd, fsck, rlogin, tip, etc.  Expect is also useful
 as telnet, ftp, passwd, fsck, rlogin, tip, etc.  Expect is also useful
@@ -71,19 +72,21 @@ Install the expect package if you'd like to develop scripts which interact
 with interactive applications.  You'll also need to install the tcl
 with interactive applications.  You'll also need to install the tcl
 package.
 package.
 
 
+
 %package devel
 %package devel
 Summary: Development files for expect library.
 Summary: Development files for expect library.
 Summary(ja): expect ライブラリの開発用ファイル
 Summary(ja): expect ライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: expect = %{version}-%{release}
 Requires: expect = %{version}-%{release}
 Obsoletes: expect <= 5.43-0vl4
 Obsoletes: expect <= 5.43-0vl4
 
 
 %description devel
 %description devel
 This package contains development files for the expect library.
 This package contains development files for the expect library.
 
 
+
 %package -n expectk
 %package -n expectk
 Summary: A program-script interaction and testing utility
 Summary: A program-script interaction and testing utility
-Group: Development/Tools
+Group: programming
 Requires: expect = %{version}-%{release}
 Requires: expect = %{version}-%{release}
 Obsoletes: expect <= 5.43-0vl4
 Obsoletes: expect <= 5.43-0vl4
 
 
@@ -94,6 +97,10 @@ in expect-5.45, now the package contains just these scripts.
 Please use tclsh with package require Tk and Expect instead
 Please use tclsh with package require Tk and Expect instead
 of expectk.
 of expectk.
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n expect%{version}
 %setup -q -n expect%{version}
 %patch0 -p1 -b .log_file
 %patch0 -p1 -b .log_file
@@ -113,19 +120,21 @@ of expectk.
 %patch103 -p1 -b .passmass-su-full-path
 %patch103 -p1 -b .passmass-su-full-path
 %patch104 -p1 -b .mkpasswd-man
 %patch104 -p1 -b .mkpasswd-man
 %patch105 -p0 -b .format-security
 %patch105 -p0 -b .format-security
+%patch106 -p1 -b .configure-c99
+%patch107 -p1
 # -pkgpath.patch touch configure.in
 # -pkgpath.patch touch configure.in
 aclocal
 aclocal
 autoconf
 autoconf
 ( cd testsuite
 ( cd testsuite
   autoconf -I.. )
   autoconf -I.. )
 
 
+
 %build
 %build
+export CFLAGS="%{optflags} -std=gnu17"
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-shared \
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --enable-shared \
 	--with-tclinclude=%{_includedir}/tcl-private/generic
 	--with-tclinclude=%{_includedir}/tcl-private/generic
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
-%check
-make test
 
 
 %install
 %install
 rm -rf ${RPM_BUILD_ROOT}
 rm -rf ${RPM_BUILD_ROOT}
@@ -146,15 +155,11 @@ rm -f "$RPM_BUILD_ROOT"%{_bindir}/autopasswd
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libexpect%{version}.so
 
 
 
 
-%post -p /sbin/ldconfig -n expect
+%check
-
+make test
-%postun -p /sbin/ldconfig -n expect
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %files
-%%defattr(-,root,root)
 %doc FAQ HISTORY NEWS README
 %doc FAQ HISTORY NEWS README
 %{_bindir}/expect
 %{_bindir}/expect
 %{_bindir}/autoexpect
 %{_bindir}/autoexpect
@@ -185,13 +190,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xkibitz.1.gz
 %{_mandir}/man1/xkibitz.1.gz
 
 
 %files devel
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libexpect.so
 %{_libdir}/libexpect.so
 %{_mandir}/man3/libexpect.3*
 %{_mandir}/man3/libexpect.3*
 %{_includedir}/*
 %{_includedir}/*
 
 
 %files -n expectk
 %files -n expectk
-%defattr(-,root,root,-)
 %{_bindir}/multixterm
 %{_bindir}/multixterm
 %{_bindir}/tknewsbiff
 %{_bindir}/tknewsbiff
 %{_bindir}/tkpasswd
 %{_bindir}/tkpasswd
@@ -201,6 +204,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Tue Jun 10 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.45.1-2
+- rebuilt with current environment.
+
 * Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.45.4-1
 * Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.45.4-1
 - new upstream release.
 - new upstream release.
 - built with tcl/tk-8.6.9.
 - built with tcl/tk-8.6.9.

+ 8 - 11
p/python3/python3-vl.spec

@@ -6,7 +6,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Name: python3
 Name: python3
-Version: 3.11.6
+Version: 3.11.13
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: programming
 Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
@@ -36,7 +36,7 @@ Provides: python(abi) = 3
 # The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
 # The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
 # When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly.
 # When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly.
 # In such cases, the patch needs to be amended and the versions updated here:
 # In such cases, the patch needs to be amended and the versions updated here:
-%global pip_version 23.2.1
+%global pip_version 24.0
 %global setuptools_version 65.5.0
 %global setuptools_version 65.5.0
 
 
 #Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
 #Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
@@ -106,6 +106,7 @@ Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-g
 
 
 # vine
 # vine
 Patch10000: python3-flatten.patch
 Patch10000: python3-flatten.patch
+Patch10001: tkinter-tcl9.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
 BuildRequires: autoconf
@@ -129,7 +130,7 @@ BuildRequires: sqlite3-devel
 BuildRequires: tar
 BuildRequires: tar
 BuildRequires: valgrind-devel
 BuildRequires: valgrind-devel
 BuildRequires: xz-devel
 BuildRequires: xz-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 
 
 %description
 %description
 Python is an interpreted, interactive, object-oriented programming
 Python is an interpreted, interactive, object-oriented programming
@@ -224,6 +225,7 @@ for the Python language.
 %if %{with flat}
 %if %{with flat}
 %patch10000 -p1
 %patch10000 -p1
 %endif
 %endif
+#patch10001 -p1
 
 
 %if %{with rpmwheels}
 %if %{with rpmwheels}
 rm Lib/ensurepip/_bundled/pip-%{pip_version}-py3-none-any.whl
 rm Lib/ensurepip/_bundled/pip-%{pip_version}-py3-none-any.whl
@@ -289,7 +291,6 @@ export PYTHON=%{__python3}
 %global flags_override CFLAGS_NODIST="$CFLAGS_NODIST"
 %global flags_override CFLAGS_NODIST="$CFLAGS_NODIST"
 
 
 #make %{?_smp_mflags} %{flags_override} regen-all PYTHON_FOR_REGEN="python3"
 #make %{?_smp_mflags} %{flags_override} regen-all PYTHON_FOR_REGEN="python3"
-
 make %{?_smp_mflags} %{flags_override}
 make %{?_smp_mflags} %{flags_override}
 
 
 
 
@@ -410,9 +411,6 @@ make test
 %endif
 %endif
 
 
 
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
 %ifarch x86_64
 %ifarch x86_64
 %pre
 %pre
 if [ ! -e %{_prefix}/lib/python%{libvers} ]; then
 if [ ! -e %{_prefix}/lib/python%{libvers} ]; then
@@ -422,7 +420,6 @@ fi
 
 
 
 
 %files -f mainpkg.files
 %files -f mainpkg.files
-%defattr(-, root, root)
 %license LICENSE
 %license LICENSE
 %doc Misc/ACKS Misc/HISTORY Misc/NEWS Misc/Porting Misc/README
 %doc Misc/ACKS Misc/HISTORY Misc/NEWS Misc/Porting Misc/README
 %{_libdir}/libpython*
 %{_libdir}/libpython*
@@ -434,7 +431,6 @@ fi
 %attr(755,root,root) %dir %{python3_purelib}/site-packages
 %attr(755,root,root) %dir %{python3_purelib}/site-packages
 
 
 %files devel
 %files devel
-%defattr(-,root,root)
 %{_bindir}/2to3-%{binsuffix}
 %{_bindir}/2to3-%{binsuffix}
 %{_bindir}/msgfmt%{binsuffix}.py
 %{_bindir}/msgfmt%{binsuffix}.py
 %{_bindir}/pathfix%{binsuffix}.py
 %{_bindir}/pathfix%{binsuffix}.py
@@ -456,18 +452,19 @@ fi
 %{_datadir}/icons/hicolor/*/apps/idle3.*
 %{_datadir}/icons/hicolor/*/apps/idle3.*
 
 
 %files tkinter
 %files tkinter
-%defattr(-,root,root)
 %{python3_platlib}/__pycache__/turtle.*
 %{python3_platlib}/__pycache__/turtle.*
 %{python3_platlib}/tkinter
 %{python3_platlib}/tkinter
 %{python3_platlib}/turtledemo
 %{python3_platlib}/turtledemo
 %{python3_platlib}/lib-dynload/_tkinter.*.so*
 %{python3_platlib}/lib-dynload/_tkinter.*.so*
 
 
 %files docs
 %files docs
-%defattr(-,root,root)
 %{config_htmldir}/*
 %{config_htmldir}/*
 
 
 
 
 %changelog
 %changelog
+* Tue Jun 10 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.13-1
+- new upstream release.
+
 * Sat Oct 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.6-1
 * Sat Oct 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.11.6-1
 - new upstream release.
 - new upstream release.
 
 

+ 23 - 30
s/sqlite3/sqlite3-vl.spec

@@ -9,10 +9,10 @@
 %define tclver 8.6
 %define tclver 8.6
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
-%define year 2024
+%define year 2025
-%define realver 3460000
+%define realver 3500100
-%define docver 3460000
+%define docver 3500100
-%define rpmver 3.46.0
+%define rpmver 3.50.1
 
 
 Summary: SQLite is a C library that implements an embeddable SQL database engine
 Summary: SQLite is a C library that implements an embeddable SQL database engine
 Summary(ja): SQLite は組み込み型SQLデータベースエンジンを実装するCライブラリです。
 Summary(ja): SQLite は組み込み型SQLデータベースエンジンを実装するCライブラリです。
@@ -33,6 +33,7 @@ Patch1: sqlite-3.34.1-lemon-system-template.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tcl-devel, libedit-devel, ncurses-devel, pkgconfig(zlib)
 BuildRequires: tcl-devel, libedit-devel, ncurses-devel, pkgconfig(zlib)
+BuildRequires: chrpath
 
 
 %description
 %description
 SQLite is a C library that implements an embeddable SQL database engine.
 SQLite is a C library that implements an embeddable SQL database engine.
@@ -158,9 +159,6 @@ rm test/func4.test
 # Remove backup-file
 # Remove backup-file
 rm -f %{name}-doc-%{docver}/sqlite.css~ || :
 rm -f %{name}-doc-%{docver}/sqlite.css~ || :
 
 
-autoupdate
-autoconf
-
 
 
 %build
 %build
 export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS \
 export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS \
@@ -171,6 +169,8 @@ export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS \
                -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
                -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
                -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \
                -DSQLITE_ENABLE_FTS3_PARENTHESIS=1 \
                -DSQLITE_ENABLE_DBPAGE_VTAB \
                -DSQLITE_ENABLE_DBPAGE_VTAB \
+               -DSQLITE_ENABLE_SESSION \
+               -DSQLITE_ENABLE_PREUPDATE_HOOK \
                -Wall -fno-strict-aliasing"
                -Wall -fno-strict-aliasing"
 %configure \
 %configure \
            --enable-load-extension \
            --enable-load-extension \
@@ -179,26 +179,26 @@ export CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS \
            --enable-fts4 \
            --enable-fts4 \
            --enable-fts5 \
            --enable-fts5 \
            --enable-rtree \
            --enable-rtree \
-           --enable-threads-override-locks
+           --soname=legacy \
-
+           --disable-static
-# rpath removal
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 
-%{__make} %{?_smp_mflags}
+%make_build
 
 
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
+DESTDIR=%{buildroot} %{__make} install
-
-DESTDIR=${RPM_BUILD_ROOT} %{__make} install
 
 
 ## remove unuse files
 ## remove unuse files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
+rm -rf %{buildroot}%{_libdir}/*.{a,la}
+
+install -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
+install -D -m0755 lemon %{buildroot}%{_bindir}/lemon
+install -D -m0644 tool/lempar.c %{buildroot}%{_datadir}/lemon/lempar.c
 
 
-install -D -m0644 sqlite3.1 $RPM_BUILD_ROOT/%{_mandir}/man1/sqlite3.1
+# This is needed since rpath removal using sed won't work for tcl library for some reason
-install -D -m0755 lemon $RPM_BUILD_ROOT/%{_bindir}/lemon
+chrpath --delete %{buildroot}%{_datadir}/tcl%{tclver}/%{packagename}/*.so
-install -D -m0644 tool/lempar.c $RPM_BUILD_ROOT/%{_datadir}/lemon/lempar.c
+chrpath --delete %{buildroot}%{_libdir}/*.so.%{version}
+chrpath --delete %{buildroot}%{_bindir}/sqlite3
 
 
 
 
 %if %{with test}
 %if %{with test}
@@ -217,44 +217,37 @@ make test
 %endif
 %endif
 
 
 
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-
 %files
 %files
-%defattr(-, root, root)
 %{_bindir}/sqlite3
 %{_bindir}/sqlite3
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
 %{_mandir}/*/*
 %{_mandir}/*/*
 
 
 %files -n %{name}-devel
 %files -n %{name}-devel
-%defattr(-, root, root)
 %{_libdir}/*.so
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 %{_includedir}/*
 %doc doc/*
 %doc doc/*
 
 
 %files -n lemon
 %files -n lemon
-%defattr(-, root, root)
 %{_bindir}/lemon
 %{_bindir}/lemon
 %{_datadir}/lemon
 %{_datadir}/lemon
 
 
 %files -n %{name}-tcl
 %files -n %{name}-tcl
-%defattr(-, root, root)
 %{_datadir}/tcl%{tclver}/%{packagename}/*
 %{_datadir}/tcl%{tclver}/%{packagename}/*
 
 
 %if %{build_compat32}
 %if %{build_compat32}
 %files -n compat32-%{name}
 %files -n compat32-%{name}
-%defattr(-, root, root)
 %{_libdir}/*.so.*
 %{_libdir}/*.so.*
 
 
 %files -n compat32-%{name}-devel
 %files -n compat32-%{name}-devel
-%defattr(-, root, root)
 %{_libdir}/*.so
 %{_libdir}/*.so
 %endif
 %endif
 
 
 
 
 %changelog
 %changelog
+* Wed Jun 11 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.50.1-1
+- new upstream release.
+
 * Sat Jun 29 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.46.0-1
 * Sat Jun 29 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.46.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 32 - 40
t/tcl/tcl-vl.spec

@@ -1,13 +1,13 @@
-%global itcl_version 4.2.0
+%global itcl_version 4.3.2
-%global tdbc_version 1.1.1
+%global tdbc_version 1.1.10
-%global thread_version 2.8.5
+%global thread_version 3.0.1
 
 
 %{!?sdt:%define sdt 0}
 %{!?sdt:%define sdt 0}
 
 
 Summary: A Tcl/Tk development environment: tcl
 Summary: A Tcl/Tk development environment: tcl
 Summary(ja): Tcl/Tk 開発環境: tcl
 Summary(ja): Tcl/Tk 開発環境: tcl
 Name: tcl
 Name: tcl
-Version: 8.6.13
+Version: 8.6.16
 %global majorver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 %global majorver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 %global minorver %(echo %{version} | sed -e 's/^.*\.//')
 %global minorver %(echo %{version} | sed -e 's/^.*\.//')
 %global htmlver %{version}
 %global htmlver %{version}
@@ -21,14 +21,13 @@ URL:     http://tcl.sourceforge.net/
 Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 #Source1: https://prdownloads.sourceforge.net/tcl/%{name}%{htmlver}-html.tar.gz
 #Source1: https://prdownloads.sourceforge.net/tcl/%{name}%{htmlver}-html.tar.gz
 Patch0: tcl-8.6.12-autopath.patch
 Patch0: tcl-8.6.12-autopath.patch
-Patch1: tcl-8.6.12-conf.patch
+Patch1: tcl-8.6.15-conf.patch
-Patch2: tcl-8.6.13-hidden.patch
 Patch3: tcl-8.6.13-tcltests-path-fix.patch
 Patch3: tcl-8.6.13-tcltests-path-fix.patch
 Patch4: tcl-8.6.13-configure-c99.patch
 Patch4: tcl-8.6.13-configure-c99.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
 BuildRequires: autoconf
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 %if %sdt
 %if %sdt
 BuildRequires: systemtap-sdt-devel
 BuildRequires: systemtap-sdt-devel
 %endif
 %endif
@@ -126,16 +125,8 @@ capabilities.
 
 
 
 
 %prep
 %prep
-#setup -n %{name}%{version} -q -a 1
 %setup -n %{name}%{version} -q
 %setup -n %{name}%{version} -q
-#mv tcl%{htmlver}/html .
-
 %autopatch -p1
 %autopatch -p1
-rm -rf compat/zlib
-
-pushd unix
-sed -i -e 's/@SHLIB_LD@/@SHLIB_LD@ -fPIC -Wl,-soname,libtcl%{majorver}.so/' Makefile.in
-popd
 
 
 
 
 %build
 %build
@@ -145,59 +136,59 @@ autoconf
 %if %sdt
 %if %sdt
 --enable-dtrace \
 --enable-dtrace \
 %endif
 %endif
---disable-threads \
+--enable-threads \
 --enable-symbols \
 --enable-symbols \
---enable-shared
+--enable-shared \
+--disable-rpath
 
 
-make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
+%make_build CFLAGS="%{optflags}" TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
+make install install-libraries install-msgs -C unix INSTALL_ROOT=%{buildroot} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
-make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 
-ln -s tclsh%{majorver} $RPM_BUILD_ROOT%{_bindir}/tclsh
+ln -s tclsh%{majorver} %{buildroot}%{_bindir}/tclsh
 
 
 # for linking with -lib%{name}
 # for linking with -lib%{name}
-ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
+ln -s lib%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so
 
 
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}
+mkdir -p %{buildroot}/%{_libdir}/%{name}%{majorver}
 
 
 # postgresql and maybe other packages too need tclConfig.sh
 # postgresql and maybe other packages too need tclConfig.sh
 # paths don't look at /usr/lib for efficiency, so we symlink into tcl8.5 for now
 # paths don't look at /usr/lib for efficiency, so we symlink into tcl8.5 for now
-ln -s %{_libdir}/%{name}Config.sh $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}/%{name}Config.sh
+ln -s %{_libdir}/%{name}Config.sh %{buildroot}/%{_libdir}/%{name}%{majorver}/%{name}Config.sh
 
 
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic,unix}
+mkdir -p %{buildroot}/%{_includedir}/%{name}-private/{generic,unix}
-find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
+find generic unix -name "*.h" -exec cp -p '{}' %{buildroot}/%{_includedir}/%{name}-private/'{}' ';'
-pushd $RPM_BUILD_ROOT/%{_includedir}
+pushd %{buildroot}/%{_includedir}
 	for i in *.h ; do
 	for i in *.h ; do
-		[ -f $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic ;
+		[ -f %{buildroot}/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %{buildroot}/%{_includedir}/%{name}-private/generic ;
 	done
 	done
 popd
 popd
 
 
 # remove buildroot traces
 # remove buildroot traces
-sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh
+sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{buildroot}/%{_libdir}/%{name}Config.sh
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/tclAppInit.c
+rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ldAix
+
+# workaround for FTBFS caused by read-only library:
+# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/DH5N6XV2NJHBIMX226HPDFUMO5NODE2V/
+chmod u+w %{buildroot}%{_libdir}/lib%{name}%{majorver}.so
 
 
 # sqlite3 extension is provided by sqlite3-tcl
 # sqlite3 extension is provided by sqlite3-tcl
 rm -rf %{buildroot}%{_libdir}/sqlite3*
 rm -rf %{buildroot}%{_libdir}/sqlite3*
 rm -f %{buildroot}%{_mandir}/mann/sqlite3*
 rm -f %{buildroot}%{_mandir}/mann/sqlite3*
-
+rm -f %{buildroot}%{_libdir}/tcl8/%{majorver}/tdbc/sqlite3*uuid
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %files
 %files
-%defattr(-,root,root,-)
 %license license.terms
 %license license.terms
-%doc README.md changes
+%doc README.md changes.md
 #doc html/*
 #doc html/*
 %{_bindir}/tclsh*
 %{_bindir}/tclsh*
 %{_libdir}/libtcl%{majorver}.so
 %{_libdir}/libtcl%{majorver}.so
 %dir %{_libdir}/tcl%{majorver}
 %dir %{_libdir}/tcl%{majorver}
 %{_datadir}/%{name}8
 %{_datadir}/%{name}8
-%{_datadir}/tcl%{majorver}
+%{_datadir}/%{name}%{majorver}
 %{_mandir}/man1/*
 %{_mandir}/man1/*
 %{_mandir}/mann/*
 %{_mandir}/mann/*
 # itcl
 # itcl
@@ -220,13 +211,11 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_mandir}/mann/tsv.n*
 %exclude %{_mandir}/mann/tsv.n*
 %exclude %{_mandir}/mann/ttrace.n*
 %exclude %{_mandir}/mann/ttrace.n*
 
 
-
 %files devel
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/*
 %{_includedir}/*
 %{_libdir}/pkgconfig/tcl.pc
 %{_libdir}/pkgconfig/tcl.pc
 %{_libdir}/libtcl.so
 %{_libdir}/libtcl.so
-%{_libdir}/libtclstub%{majorver}.a
+%{_libdir}/libtclstub*.a
 %{_libdir}/tclConfig.sh
 %{_libdir}/tclConfig.sh
 %{_libdir}/tclooConfig.sh
 %{_libdir}/tclooConfig.sh
 %{_libdir}/tcl%{majorver}/tclConfig.sh
 %{_libdir}/tcl%{majorver}/tclConfig.sh
@@ -275,6 +264,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Tue Jun 10 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.16-1
+- new upstream release.
+
 * Sat Oct 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.13-1
 * Sat Oct 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.13-1
 - new upstream release.
 - new upstream release.
 - dropped ldconfig scriptlets.
 - dropped ldconfig scriptlets.

+ 21 - 31
t/tk/tk-vl.spec

@@ -1,7 +1,7 @@
 Summary: A Tcl/Tk development environment: tk
 Summary: A Tcl/Tk development environment: tk
 Summary(ja): Tcl/Tk 開発環境: tk
 Summary(ja): Tcl/Tk 開発環境: tk
 Name: tk
 Name: tk
-Version: 8.6.13
+Version: 8.6.16
 %global majorver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 %global majorver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 %global minorver %(echo %{version} | sed -e 's/^.*\.//')
 %global minorver %(echo %{version} | sed -e 's/^.*\.//')
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
@@ -12,10 +12,12 @@ Distribution: Vine Linux
 License: TCL
 License: TCL
 URL: https://tcl.sourceforge.net/
 URL: https://tcl.sourceforge.net/
 Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
+Patch1: tk-8.6.12-make.patch
+Patch2: tk-8.6.15-conf.patch
 # https://core.tcl-lang.org/tk/tktview/dccd82bdc70dc25bb6709a6c14880a92104dda43
 # https://core.tcl-lang.org/tk/tktview/dccd82bdc70dc25bb6709a6c14880a92104dda43
 Patch3: tk-8.6.10-font-sizes-fix.patch
 Patch3: tk-8.6.10-font-sizes-fix.patch
 
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
 BuildRequires: autoconf
 BuildRequires: libX11-devel
 BuildRequires: libX11-devel
 BuildRequires: libXft-devel
 BuildRequires: libXft-devel
@@ -60,75 +62,63 @@ The package contains the development files and man pages for tk.
 
 
 
 
 %prep
 %prep
-%setup -n %{name}%{version} -q
+%autosetup -p1 -n %{name}%{version}
-
-sed -i -e 's/555/755/g' unix/Makefile.in
-sed -i -e 's/@SHLIB_LD@/@SHLIB_LD@ -fPIC -Wl,-soname,libtk%{majorver}.so/' unix/Makefile.in
 
 
 
 
 %build
 %build
 cd unix
 cd unix
 autoconf
 autoconf
 
 
-export CFLAGS="%{optflags} -fPIC"
 %configure \
 %configure \
---disable-rpath \
+	--enable-threads \
---enable-threads
+	--disable-zipfs
 
 
-make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
+%make_build CFLAGS="%{optflags}" TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 
 
 
 %install
 %install
-rm -rf $RPM_BUILD_ROOT
+make install -C unix INSTALL_ROOT=%{buildroot} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
-
-make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 
-ln -s wish%{majorver} $RPM_BUILD_ROOT%{_bindir}/wish
+ln -s wish%{majorver} %{buildroot}%{_bindir}/wish
 
 
 # for linking with -l%{name}
 # for linking with -l%{name}
-ln -s lib%{name}%{majorver}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
+ln -s libtcl8%{name}%{majorver}.so %{buildroot}%{_libdir}/lib%{name}.so
 
 
-mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic/ttk,unix}
+mkdir -p %{buildroot}/%{_includedir}/%{name}-private/{generic/ttk,unix}
-find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
+find generic unix -name "*.h" -exec cp -p '{}' %{buildroot}/%{_includedir}/%{name}-private/'{}' ';'
-( cd $RPM_BUILD_ROOT/%{_includedir}
+( cd %{buildroot}/%{_includedir}
   for i in *.h ; do
   for i in *.h ; do
-    [ -f $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic ;
+    [ -f %{buildroot}/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i %{buildroot}/%{_includedir}/%{name}-private/generic ;
   done
   done
 )
 )
 
 
 # remove buildroot traces
 # remove buildroot traces
-sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh
+sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{buildroot}/%{_libdir}/%{name}Config.sh
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/tkAppInit.c
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/prolog.ps
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %files
 %files
-%defattr(-,root,root,-)
 %license license.terms
 %license license.terms
-%doc README changes
+%doc README.md changes.md
 %{_bindir}/wish*
 %{_bindir}/wish*
 %{_datadir}/tk%{majorver}
 %{_datadir}/tk%{majorver}
 %{_libdir}/libtk%{majorver}.so
 %{_libdir}/libtk%{majorver}.so
 %{_libdir}/tk%{majorver}
 %{_libdir}/tk%{majorver}
-%{_libdir}/tkConfig.sh
 %{_mandir}/man1/*
 %{_mandir}/man1/*
 %{_mandir}/mann/*
 %{_mandir}/mann/*
 
 
 %files devel
 %files devel
-%defattr(-,root,root)
 %{_includedir}/*
 %{_includedir}/*
 %{_libdir}/libtk.so
 %{_libdir}/libtk.so
-%{_libdir}/libtkstub%{majorver}.a
+%{_libdir}/libtkstub*.a
 %{_libdir}/tkConfig.sh
 %{_libdir}/tkConfig.sh
 %{_libdir}/pkgconfig/tk.pc
 %{_libdir}/pkgconfig/tk.pc
 %{_mandir}/man3/*
 %{_mandir}/man3/*
 
 
 
 
 %changelog
 %changelog
+* Tue Jun 10 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.16-1
+- new upstream release.
+
 * Sat Oct 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.13-1
 * Sat Oct 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.13-1
 - new upstream release.
 - new upstream release.
 - dropped ldconfig scriptlets.
 - dropped ldconfig scriptlets.