rpms/fltk/devel fltk-1.1.x-r5750-rpath.patch, 1.1, 1.2 fltk.spec, 1.28, 1.29

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/fltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11479

Modified Files:
	fltk-1.1.x-r5750-rpath.patch fltk.spec 
Log Message:
* Sun Apr 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.3.r5750
- *really* fix --rpath issue, using non-empty patch this time (#238284)


fltk-1.1.x-r5750-rpath.patch:

Index: fltk-1.1.x-r5750-rpath.patch
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk-1.1.x-r5750-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fltk-1.1.x-r5750-rpath.patch	29 Apr 2007 12:51:05 -0000	1.1
+++ fltk-1.1.x-r5750-rpath.patch	29 Apr 2007 17:50:16 -0000	1.2
@@ -0,0 +1,30 @@
+--- fltk-1.1.x-r5750/configure.in.rpath	2007-02-10 15:21:02.000000000 -0600
++++ fltk-1.1.x-r5750/configure.in	2007-04-29 12:47:29.000000000 -0500
+@@ -180,9 +180,9 @@
+             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
+             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
+             DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
+-	    if test "x$libdir" != "x/usr/lib"; then
+-		    DSOLINK="-Wl,-rpath,$libdir"
+-            fi
++#	    if test "x$libdir" != "x/usr/lib"; then
++#		    DSOLINK="-Wl,-rpath,$libdir"
++#	    fi
+ 	    ;;
+ 	AIX*)
+             DSONAME="libfltk_s.a"
+--- fltk-1.1.x-r5750/configure.rpath	2007-03-23 00:00:35.000000000 -0500
++++ fltk-1.1.x-r5750/configure	2007-04-29 12:47:59.000000000 -0500
+@@ -1482,9 +1482,9 @@
+             GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
+             IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
+             DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
+-	    if test "x$libdir" != "x/usr/lib"; then
+-		    DSOLINK="-Wl,-rpath,$libdir"
+-            fi
++#	    if test "x$libdir" != "x/usr/lib"; then
++#		    DSOLINK="-Wl,-rpath,$libdir"
++#	    fi
+ 	    ;;
+ 	AIX*)
+             DSONAME="libfltk_s.a"


Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fltk.spec	29 Apr 2007 12:51:05 -0000	1.28
+++ fltk.spec	29 Apr 2007 17:50:16 -0000	1.29
@@ -5,7 +5,7 @@
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.1.8
-Release:	0.2.%{snap}%{?dist}
+Release:	0.3.%{snap}%{?dist}
 
 License:	LGPL with exceptions
 Group:		System Environment/Libraries
@@ -79,6 +79,7 @@
 %patch1 -p1 -b .199656
 %patch2 -p1 -b .test
 %patch3 -p1 -b .undefined
+%patch4 -p1 -b .rpath
 
 
 %build
@@ -201,6 +202,9 @@
 
 
 %changelog
+* Sun Apr 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.3.r5750
+- *really* fix --rpath issue, using non-empty patch this time (#238284)
+
 * Sun Apr 29 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.1.8-0.2.r5750
 - nuke --rpath (#238284)