rpms/blt/devel blt2.4z-norpath.patch,NONE,1.1 blt.spec,1.21,1.22

[Michael Thomas (wart)]

Author: wart

Update of /cvs/pkgs/rpms/blt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30681

Modified Files:
	blt.spec 
Added Files:
	blt2.4z-norpath.patch 
Log Message:
- Rebuild for gcc 4.3
- Add patch to add soname and remove rpath



blt2.4z-norpath.patch:

--- NEW FILE blt2.4z-norpath.patch ---
--- blt2.4z/configure.in.orig	2008-02-09 11:33:17.000000000 -0800
+++ blt2.4z/configure.in	2008-02-09 11:33:38.000000000 -0800
@@ -1201,7 +1201,7 @@
     SHLIB_CFLAGS="-fPIC"
     SHLIB_LD="${CC}"
     SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
-    LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
+    LD_RUN_PATH=""
     
     LDFLAGS=""
     EXTRA_LIB_SPECS="-ldl"
--- blt2.4z/configure.orig	2008-02-09 11:24:16.000000000 -0800
+++ blt2.4z/configure	2008-02-09 11:33:38.000000000 -0800
@@ -4039,7 +4039,7 @@
     SHLIB_CFLAGS="-fPIC"
     SHLIB_LD="${CC}"
     SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@'
-    LD_RUN_PATH="-Wl,-rpath,${loader_run_path}"
+    LD_RUN_PATH=""
     
     LDFLAGS=""
     EXTRA_LIB_SPECS="-ldl"


Index: blt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blt/devel/blt.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- blt.spec	7 Jan 2008 23:02:25 -0000	1.21
+++ blt.spec	9 Feb 2008 19:58:42 -0000	1.22
@@ -5,7 +5,7 @@
 Summary: BLT widget extension to Tcl/Tk scripting language development
 Name: blt
 Version: 2.4
-Release: 24%{?dist}
+Release: 25%{?dist}
 
 License: MIT
 Group: Development/Libraries
@@ -15,6 +15,7 @@
 Patch1: http://jfontain.free.fr/blt2.4z-patch-64
 Patch2: blt2.4-tk8.5.patch
 Patch3: blt2.4z-destdir.patch
+Patch4: blt2.4z-norpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 
 Provides: tk-blt = %{version}-%{release}
@@ -54,6 +55,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # Fix bad interpreter path
 sed -i -e 's#/usr/local/bin/tclsh#/usr/bin/tclsh#' demos/scripts/page.tcl
@@ -64,9 +66,15 @@
 
 %build
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir} --with-blt=%{tcl_sitelib} --includedir=%{_includedir}/%{name}
-cd src/shared
+pushd src/shared
 # no _smp_mflags; race conditions.
-make SHLIB_LD_FLAGS=-shared
+make
+popd
+
+for file in demos/*.tcl ; do
+    sed -i -e 's#../src/bltwish#/usr/bin/wish#' $file
+done
+sed -i -e 's#../bltwish#/usr/bin/wish#' demos/scripts/xcolors.tcl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -100,6 +108,10 @@
 %{_includedir}/%{name}
 
 %changelog
+* Sat Feb 9 2008 Wart <wart at kobold.org> 2.4-25
+- Rebuild for gcc 4.3
+- Add patch to add soname and remove rpath
+
 * Mon Jan 07 2008 Wart <wart at kobold.org> 2.4-24
 - Move pkgIndex.tcl file to %%{_libdir} as it contains arch-specific
   components