diff --git a/sources b/sources index 70593ac..63da72b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tk8.6.8-src.tar.gz) = d0d30637b733fb0b0d38461b6d872934c04af422fcdb7ec41a72331b2529cc94414e6f441f95a98642d69505e4f41469847fedd1cbe58bd08cdd818fcabd1db9 +SHA512 (tk8.6.9.1-src.tar.gz) = b9c811ffc8326331ae03c6fb25ea71f7a5eaeebd9d5a16a51a1671d0f0422268bd351b077e17ae925f0a7eddac9642aa640658615c52d4269c299373af031a92 diff --git a/tk-8.6.9.1-conf.patch b/tk-8.6.9.1-conf.patch new file mode 100644 index 0000000..42d573e --- /dev/null +++ b/tk-8.6.9.1-conf.patch @@ -0,0 +1,18 @@ +diff -up tk8.6.9/unix/tcl.m4.conf tk8.6.9/unix/tcl.m4 +--- tk8.6.9/unix/tcl.m4.conf 2019-11-06 16:03:44.836585545 -0500 ++++ tk8.6.9/unix/tcl.m4 2019-11-06 16:06:27.910179543 -0500 +@@ -1407,12 +1407,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ + # 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,${@}' + DL_OBJS="tclLoadDl.o" + DL_LIBS="-ldl" + LDFLAGS="$LDFLAGS -Wl,--export-dynamic" + AS_IF([test $doRpath = yes], [ +- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) ++ CC_SEARCH_FLAGS='']) + LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} + AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) + AS_IF([test $do64bit = yes], [ diff --git a/tk.spec b/tk.spec index c8f5256..e8222af 100644 --- a/tk.spec +++ b/tk.spec @@ -1,17 +1,17 @@ %define majorver 8.6 -%define vers %{majorver}.8 +%define vers %{majorver}.9 Summary: The graphical toolkit for the Tcl scripting language Name: tk -Version: %{vers} +Version: %{vers}.1 Release: 1%{?dist} Epoch: 1 License: TCL URL: http://tcl.sourceforge.net Source0: http://download.sourceforge.net/sourceforge/tcl/%{name}%{version}-src.tar.gz -Requires: tcl = %{epoch}:%{version} +Requires: tcl = %{epoch}:%{vers} BuildRequires: gcc -BuildRequires: tcl-devel = %{epoch}:%{version}, autoconf +BuildRequires: tcl-devel = %{epoch}:%{vers}, autoconf BuildRequires: libX11-devel BuildRequires: libXft-devel # panedwindow.n from itcl conflicts @@ -19,7 +19,7 @@ Conflicts: itcl <= 3.2 Obsoletes: tile <= 0.8.2 Provides: tile = 0.8.2 Patch1: tk-8.6.5-make.patch -Patch2: tk-8.6.7-conf.patch +Patch2: tk-8.6.9.1-conf.patch # fix implicit linkage of freetype that breaks xft detection (#677692) Patch3: tk-8.6.5-fix-xft.patch Patch4: tk-8.6.7-no-fonts-fix.patch @@ -31,7 +31,7 @@ way to create cross-platform GUI applications. %package devel Summary: Tk graphical toolkit development files Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: tcl-devel = %{epoch}:%{version} +Requires: tcl-devel = %{epoch}:%{vers} Requires: libX11-devel libXft-devel %description devel @@ -41,7 +41,7 @@ way to create cross-platform GUI applications. The package contains the development files and man pages for tk. %prep -%setup -n %{name}%{version} -q +%setup -n %{name}%{vers} -q %patch1 -p1 -b .make %patch2 -p1 -b .conf @@ -107,6 +107,9 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu %{_datadir}/%{name}%{majorver}/tkAppInit.c %changelog +* Wed Nov 6 2019 Tom Callaway - 1:8.6.9.1-1 +- update to 8.6.9.1 + * Mon Mar 19 2018 Jaroslav Škarvada - 1:8.6.8-1 - New version