diff --git a/.cvsignore b/.cvsignore index 11763b0..2fc4a3f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ tk8.4.11-src.tar.gz tk8.4.12-src.tar.gz +tk8.4.13-src.tar.gz diff --git a/sources b/sources index 9f3de2e..6bcfcf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -316491cb82d898b434842353aed1f0d6 tk8.4.12-src.tar.gz +0a16d4d9398e43cbb85784c85fb807a4 tk8.4.13-src.tar.gz diff --git a/tk-8.4.13-autoconf.patch b/tk-8.4.13-autoconf.patch new file mode 100644 index 0000000..839614e --- /dev/null +++ b/tk-8.4.13-autoconf.patch @@ -0,0 +1,29 @@ +--- tk8.4.13/unix/tcl.m4.ac123 2006-04-20 14:53:21.000000000 -0400 ++++ tk8.4.13/unix/tcl.m4 2006-04-20 14:54:35.000000000 -0400 +@@ -1123,7 +1123,7 @@ + + # AIX v<=4.1 has some different flags than 4.2+ + if test "$system" = "AIX-4.1" -o "`uname -v`" -lt "4" ; then +- LIBOBJS="$LIBOBJS tclLoadAix.o" ++ AC_LIBOBJ(tclLoadAix) + DL_LIBS="-lld" + fi + +@@ -1365,7 +1365,7 @@ + # is kind of overkill but it works. + # Disable inlining only when one of the + # files in compat/*.c is being linked in. +- if test x"${LIBOBJS}" != x ; then ++ if test x"${LIB@&t@OBJS}" != x ; then + CFLAGS="$CFLAGS -fno-inline" + fi + +@@ -2571,7 +2571,7 @@ + }], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy, + tcl_cv_strtod_buggy=buggy)]) + if test "$tcl_cv_strtod_buggy" = buggy; then +- LIBOBJS="$LIBOBJS fixstrtod.o" ++ AC_LIBOBJ(fixstrtod) + AC_DEFINE(strtod, fixstrtod) + fi + fi diff --git a/tk.spec b/tk.spec index 4019c81..739b1d7 100644 --- a/tk.spec +++ b/tk.spec @@ -2,8 +2,8 @@ Summary: Tk graphical toolkit for the Tcl scripting language Name: tk -Version: %{majorver}.12 -Release: 1.2 +Version: %{majorver}.13 +Release: 1 License: BSD Group: Development/Languages URL: http://tcl.sourceforge.net/ @@ -18,8 +18,7 @@ Obsoletes: itcl <= 3.2 Patch1: tk-8.3.5-tclm4-soname.patch Patch2: tk-8.4.4-lib-perm.patch Patch3: tk-8.4-no_rpath.patch -Patch4: tk-8.4-autoconf.patch -Patch5: tk-8.4.12-relid.patch +Patch4: tk-8.4.13-autoconf.patch %description When paired with the Tcl scripting language, Tk provides a fast and powerful @@ -46,7 +45,6 @@ The package contains the development files and man pages for tk. %patch2 -p1 -b .2-rolib %patch3 -p1 -b .3-rpath %patch4 -p1 -b .4-ac213 -%patch5 -p1 -b .5-relid # patch1 touches tcl.m4 cd unix @@ -117,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/mann/* %changelog +* Thu Apr 20 2006 David Cantrell - 8.4.13-1 +- Upgraded to Tk 8.4.13 + * Fri Feb 10 2006 Jesse Keating - 8.4.12-1.2 - bump again for double-long bug on ppc(64)