From 3cf8b868130a8ba722a79550459abae6020df3cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 30 Jul 2012 11:37:01 +0200 Subject: [PATCH] New version Resolves: rhbz#843902 --- tk.spec | 8 ++++++-- tk8.5-make.patch | 12 ++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tk.spec b/tk.spec index 34d009e..9e6bf30 100644 --- a/tk.spec +++ b/tk.spec @@ -1,10 +1,10 @@ %define majorver 8.5 -%define vers %{majorver}.11 +%define vers %{majorver}.12 Summary: The graphical toolkit for the Tcl scripting language Name: tk Version: %{vers} -Release: 3%{?dist} +Release: 1%{?dist} Epoch: 1 License: TCL Group: Development/Languages @@ -119,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}%{majorver}/tkAppInit.c %changelog +* Mon Jul 30 2012 Jaroslav Škarvada - 1:8.5.12-1 +- New version + Resolves: rhbz#843902 + * Fri Jul 27 2012 Fedora Release Engineering - 1:8.5.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/tk8.5-make.patch b/tk8.5-make.patch index 27859e2..251342b 100644 --- a/tk8.5-make.patch +++ b/tk8.5-make.patch @@ -3,10 +3,10 @@ diff -up tk8.5.2/unix/Makefile.in.ble tk8.5.2/unix/Makefile.in +++ tk8.5.2/unix/Makefile.in 2008-05-19 14:45:52.000000000 +0200 @@ -713,7 +713,7 @@ install-binaries: $(TK_LIB_FILE) $(TK_ST fi - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" + @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ -- @chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) -+ @chmod 755 "$(LIB_INSTALL_DIR)"/$(LIB_FILE) - @echo "Installing wish@EXEEXT@ as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" - @$(INSTALL_PROGRAM) wish@EXEEXT@ "$(BIN_INSTALL_DIR)"/wish$(VERSION)@EXEEXT@ - @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" +- @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" ++ @chmod 755 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" + @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ + $(INSTALL_LIBRARY) "${TOP_DIR}/win/tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ + chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\