|
|
@@ -1,13 +1,13 @@
|
|
|
-%global itcl_version 4.2.0
|
|
|
-%global tdbc_version 1.1.1
|
|
|
-%global thread_version 2.8.5
|
|
|
+%global itcl_version 4.3.2
|
|
|
+%global tdbc_version 1.1.10
|
|
|
+%global thread_version 3.0.1
|
|
|
|
|
|
%{!?sdt:%define sdt 0}
|
|
|
|
|
|
Summary: A Tcl/Tk development environment: tcl
|
|
|
Summary(ja): Tcl/Tk 開発環境: tcl
|
|
|
Name: tcl
|
|
|
-Version: 8.6.13
|
|
|
+Version: 8.6.16
|
|
|
%global majorver %(echo %{version} | sed -e 's/\.[0-9]*$//')
|
|
|
%global minorver %(echo %{version} | sed -e 's/^.*\.//')
|
|
|
%global htmlver %{version}
|
|
|
@@ -21,14 +21,13 @@ URL: http://tcl.sourceforge.net/
|
|
|
Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
|
|
|
#Source1: https://prdownloads.sourceforge.net/tcl/%{name}%{htmlver}-html.tar.gz
|
|
|
Patch0: tcl-8.6.12-autopath.patch
|
|
|
-Patch1: tcl-8.6.12-conf.patch
|
|
|
-Patch2: tcl-8.6.13-hidden.patch
|
|
|
+Patch1: tcl-8.6.15-conf.patch
|
|
|
Patch3: tcl-8.6.13-tcltests-path-fix.patch
|
|
|
Patch4: tcl-8.6.13-configure-c99.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: autoconf
|
|
|
-BuildRequires: zlib-devel
|
|
|
+BuildRequires: pkgconfig(zlib)
|
|
|
%if %sdt
|
|
|
BuildRequires: systemtap-sdt-devel
|
|
|
%endif
|
|
|
@@ -126,16 +125,8 @@ capabilities.
|
|
|
|
|
|
|
|
|
%prep
|
|
|
-#setup -n %{name}%{version} -q -a 1
|
|
|
%setup -n %{name}%{version} -q
|
|
|
-#mv tcl%{htmlver}/html .
|
|
|
-
|
|
|
%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
|
|
|
@@ -145,59 +136,59 @@ autoconf
|
|
|
%if %sdt
|
|
|
--enable-dtrace \
|
|
|
%endif
|
|
|
---disable-threads \
|
|
|
+--enable-threads \
|
|
|
--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
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
-make install -C unix INSTALL_ROOT=$RPM_BUILD_ROOT TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
|
|
|
+make install install-libraries install-msgs -C unix INSTALL_ROOT=%{buildroot} 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}
|
|
|
-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
|
|
|
# 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}
|
|
|
-find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
|
|
|
-pushd $RPM_BUILD_ROOT/%{_includedir}
|
|
|
+mkdir -p %{buildroot}/%{_includedir}/%{name}-private/{generic,unix}
|
|
|
+find generic unix -name "*.h" -exec cp -p '{}' %{buildroot}/%{_includedir}/%{name}-private/'{}' ';'
|
|
|
+pushd %{buildroot}/%{_includedir}
|
|
|
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
|
|
|
popd
|
|
|
|
|
|
# remove buildroot traces
|
|
|
-sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh
|
|
|
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/tclAppInit.c
|
|
|
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ldAix
|
|
|
+sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{buildroot}/%{_libdir}/%{name}Config.sh
|
|
|
+rm -rf %{buildroot}/%{_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
|
|
|
rm -rf %{buildroot}%{_libdir}/sqlite3*
|
|
|
rm -f %{buildroot}%{_mandir}/mann/sqlite3*
|
|
|
-
|
|
|
-%clean
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+rm -f %{buildroot}%{_libdir}/tcl8/%{majorver}/tdbc/sqlite3*uuid
|
|
|
|
|
|
|
|
|
%files
|
|
|
-%defattr(-,root,root,-)
|
|
|
%license license.terms
|
|
|
-%doc README.md changes
|
|
|
+%doc README.md changes.md
|
|
|
#doc html/*
|
|
|
%{_bindir}/tclsh*
|
|
|
%{_libdir}/libtcl%{majorver}.so
|
|
|
%dir %{_libdir}/tcl%{majorver}
|
|
|
%{_datadir}/%{name}8
|
|
|
-%{_datadir}/tcl%{majorver}
|
|
|
+%{_datadir}/%{name}%{majorver}
|
|
|
%{_mandir}/man1/*
|
|
|
%{_mandir}/mann/*
|
|
|
# itcl
|
|
|
@@ -220,13 +211,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%exclude %{_mandir}/mann/tsv.n*
|
|
|
%exclude %{_mandir}/mann/ttrace.n*
|
|
|
|
|
|
-
|
|
|
%files devel
|
|
|
-%defattr(-,root,root,-)
|
|
|
%{_includedir}/*
|
|
|
%{_libdir}/pkgconfig/tcl.pc
|
|
|
%{_libdir}/libtcl.so
|
|
|
-%{_libdir}/libtclstub%{majorver}.a
|
|
|
+%{_libdir}/libtclstub*.a
|
|
|
%{_libdir}/tclConfig.sh
|
|
|
%{_libdir}/tclooConfig.sh
|
|
|
%{_libdir}/tcl%{majorver}/tclConfig.sh
|
|
|
@@ -275,6 +264,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%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
|
|
|
- new upstream release.
|
|
|
- dropped ldconfig scriptlets.
|
