- really fix tk on arch using lib64

- rel 2

diff --git a/tk-lib64.patch b/tk-lib64.patch
index f681d0c97360867ad93641af74b77c54d55eb5de..8a1c3a043de488069770b3ba63bd1bd70777c5a9 100644 (file)
--- a/tk-lib64.patch
+++ b/tk-lib64.patch
@@ -10,3 +10,22 @@ diff -urN tk8.5a3.org/unix/Makefile.in tk8.5a3/unix/Makefile.in
  
  # Path to use at runtime to refer to LIB_INSTALL_DIR:
  LIB_RUNTIME_DIR               = $(libdir)
+@@ -701,17 +701,7 @@
+           rm -f "$(PKG_INDEX)"; \
+           (\
+           echo "if {[catch {package present Tcl 8.5.0}]} return";\
+-          relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
+-          if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
+-          echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]] Tk]";\
+-          else \
+-          echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
+-          echo "      || ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\
+-          echo "    package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)]] Tk]";\
+-          echo "} else {";\
+-          echo "    package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll]] Tk]";\
+-          echo "}";\
+-          fi \
++          echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load $(DLL_INSTALL_DIR)/$(TK_LIB_FILE) Tk]";\
+           ) > "$(PKG_INDEX)"; \
+           fi
+       @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"

diff --git a/tk.spec b/tk.spec
index 40dd580e0cd402fab9705373a54603f781778e55..064c2ee21c5fed882232d68d5ab7b0d2eed2075d 100644 (file)
--- a/tk.spec
+++ b/tk.spec
@@ -6,10 +6,10 @@ Summary(ru.UTF-8):    Tk GUI toolkit для Tcl
 Summary(tr.UTF-8):     Tk, Tcl için grafik kullanıcı arabirimi araç takımıdır
 Summary(uk.UTF-8):     Tk GUI toolkit для Tcl
 Name:          tk
-%define        major   8.5
+%define                major   8.5
 %define                minor   15
 Version:       %{major}.%{minor}
-Release:       1
+Release:       2
 License:       BSD
 Group:         Development/Languages/Tcl
 Source0:       http://downloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz