diff --git a/.cvsignore b/.cvsignore index 2fc4a3f..e77b033 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -tk8.4.11-src.tar.gz -tk8.4.12-src.tar.gz -tk8.4.13-src.tar.gz +tk8.5a5.tar.gz diff --git a/sources b/sources index 6bcfcf5..058258c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a16d4d9398e43cbb85784c85fb807a4 tk8.4.13-src.tar.gz +d1297b811b3672173bdf70365690fde5 tk8.5a5.tar.gz diff --git a/tk-8.4.4-lib-perm.patch b/tk-8.4.4-lib-perm.patch deleted file mode 100644 index 487c579..0000000 --- a/tk-8.4.4-lib-perm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tk8.4.11/unix/Makefile.in~ 2005-07-01 14:42:30.000000000 +0900 -+++ tk8.4.11/unix/Makefile.in 2005-07-01 14:45:47.000000000 +0900 -@@ -631,7 +631,7 @@ - fi - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" - @@INSTALL_LIB@ -- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) -+ @chmod 755 $(LIB_INSTALL_DIR)/$(LIB_FILE) - @if test "$(TK_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \ diff --git a/tk.spec b/tk.spec index 09539c8..3f5443c 100644 --- a/tk.spec +++ b/tk.spec @@ -1,9 +1,9 @@ -%define majorver 8.4 +%define majorver 8.5 Summary: Tk graphical toolkit for the Tcl scripting language Name: tk -Version: %{majorver}.13 -Release: 3%{?dist} +Version: %{majorver}a5 +Release: 1%{?dist} License: BSD Group: Development/Languages URL: http://tcl.sourceforge.net/ @@ -16,7 +16,7 @@ BuildRequires: libX11-devel, sed # panedwindow.n from itcl conflicts Obsoletes: itcl <= 3.2 Patch1: tk-8.3.5-tclm4-soname.patch -Patch2: tk-8.4.4-lib-perm.patch +Patch2: tk-8.5a5-lib-perm.patch Patch3: tk-8.4-no_rpath.patch Patch4: tk-8.4.13-autoconf.patch Patch5: tk-8.4.13-cflags.patch @@ -45,7 +45,7 @@ The package contains the development files and man pages for tk. %patch1 -p1 -b .1-soname %patch2 -p1 -b .2-rolib %patch3 -p1 -b .3-rpath -%patch4 -p1 -b .4-ac213 +#%patch4 -p1 -b .4-ac213 %patch5 -p1 -b .5-cflags # patch1 touches tcl.m4 @@ -55,7 +55,7 @@ autoconf %build TOPDIR=$PWD cd unix -%configure +%configure --enable-xft make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver} # do not run "make test" by default since it requires an X display @@ -117,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/mann/* %changelog +* Mon Dec 18 2006 Marcela Maslanova - 8.5a5-1 +- update: version 8.5a5 +- Resolves: rhbz#160442 + * Thu Jul 20 2006 David Cantrell - 8.4.13-3 - Patch from Dennis Gilmore for sparc64 (#199378)