diff --git a/tk-8.6.10-conf.patch b/tk-8.6.15-conf.patch similarity index 72% rename from tk-8.6.10-conf.patch rename to tk-8.6.15-conf.patch index e8ed85422dcd9397b1147c2ebe13825ab2a36226..22a7dec6209e93ee433a265b6a3c056e971ac2c5 100644 --- a/tk-8.6.10-conf.patch +++ b/tk-8.6.15-conf.patch @@ -2,24 +2,21 @@ diff --git a/unix/tcl.m4 b/unix/tcl.m4 index f3d08ec..dd75fc3 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -1382,7 +1382,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ +@@ -1378,7 +1378,7 @@ # get rid of the warnings. #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' -+ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}' ++ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-soname,${@}' DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="$LDFLAGS -Wl,--export-dynamic" -@@ -1398,7 +1398,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - esac +@@ -1394,7 +1394,7 @@ + esac AS_IF([test $doRpath = yes], [ - CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"']) -+ CC_SEARCH_FLAGS='']) ++ CC_SEARCH_FLAGS='']) LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) AS_IF([test $do64bit = yes], [ --- -2.27.0 - diff --git a/tk.spec b/tk.spec index b785ce33484425ef616342bca54f4e475e4b7d02..a503c396eb9719843a56e56f68c1659ab80344f0 100644 --- a/tk.spec +++ b/tk.spec @@ -1,25 +1,28 @@ %define majorver 8.6 +%define majornext 8.7 %define epoch 1 Name: tk -Version: 8.6.14 +Version: 8.6.15 Release: 1 Summary: The graphical toolkit for the Tcl scripting language Epoch: 1 License: TCL -URL: http://tcl.sourceforge.net -Source0: http://download.sourceforge.net/sourceforge/tcl/%{name}%{version}-src.tar.gz +URL: https://tcl.sourceforge.net +Source0: https://download.sourceforge.net/sourceforge/tcl/%{name}%{version}-src.tar.gz -Requires: tcl = %{epoch}:%{version} glibc +Requires: (tcl >= %{epoch}:%{majorver} with tcl < %{epoch}:%{majornext}) BuildRequires: gcc -BuildRequires: tcl-devel = %{epoch}:%{version} autoconf libX11-devel libXft-devel +BuildRequires: autoconf automake +BuildRequires: (tcl-devel >= %{epoch}:%{majorver} with tcl-devel < %{epoch}:%{majornext}) +BuildRequires: libX11-devel libXft-devel libXScrnSaver-devel Conflicts: itcl <= 3.2 Obsoletes: tile <= 0.8.2 Provides: tile = 0.8.2 Patch0001: tk-8.6.10-make.patch -Patch0002: tk-8.6.10-conf.patch +Patch0002: tk-8.6.15-conf.patch Patch0003: tk-8.6.10-font-sizes-fix.patch @@ -30,16 +33,14 @@ especially easy to program a GUI application using tcl script language. %package devel Summary: Tk graphical toolkit development files -Requires: %{name} = %{epoch}:%{version}-%{release} libX11-devel libXft-devel tcl-devel = %{epoch}:%{version} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: (tcl-devel >= %{epoch}:%{majorver} with tcl-devel < %{epoch}:%{majornext}) +Requires: libX11-devel libXft-devel libXScrnSaver-devel %description devel Package devel includes files for developing with tk. -%package help -Summary: Documents for tf - -%description help -Includes Man pages for tf. +%package_help %prep %autosetup -n %{name}%{version} -p1 @@ -69,11 +70,7 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %pre [ ! -h %{_prefix}/%{_lib}/%{name}%{majorver} ] || rm %{_prefix}/%{_lib}/%{name}%{majorver} -%ldconfig_post -%ldconfig_postun - %files -%defattr(-,root,root,-) %doc README.md changes license.terms %{_bindir}/wish* %{_datadir}/%{name}%{majorver} @@ -82,7 +79,6 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %{_libdir}/lib%{name}%{majorver}.so %files devel -%defattr(-,root,root) %{_includedir}/* %{_libdir}/lib%{name}.so %{_libdir}/%{name}Config.sh @@ -91,11 +87,13 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %{_datadir}/%{name}%{majorver}/tkAppInit.c %files help -%{_mandir}/man1/* -%{_mandir}/man3/* -%{_mandir}/mann/* +%{_mandir}/man?/* %changelog +* Wed Sep 18 2024 Funda Wang - 1:8.6.15-1 +- update to version 8.6.15 +- loosen version requirement towards tcl + * Thu Feb 29 2024 wangqia - 1:8.6.14-1 - Update to version 8.6.14 diff --git a/tk.yaml b/tk.yaml index 663bc8434c6d5e1ee8246c86a2c8f965979826f0..89e14a312d03fabda22e0b778f417915b13472cf 100644 --- a/tk.yaml +++ b/tk.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: tcltk/tk tag_prefix: ^core- -seperator: "-" +separator: "-" diff --git a/tk8.6.14-src.tar.gz b/tk8.6.15-src.tar.gz similarity index 38% rename from tk8.6.14-src.tar.gz rename to tk8.6.15-src.tar.gz index 8a6491b9006f2b49683edb12e12edcf9142e27a9..85ca24284180457520675d11dfdb8986b44de2aa 100644 Binary files a/tk8.6.14-src.tar.gz and b/tk8.6.15-src.tar.gz differ