From 1c01bd4480675df372f73b490975c74cd0335657 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sun, 29 Apr 2007 17:50:16 +0000
Subject: [PATCH] - *really* fix --rpath issue, using non-empty patch this time
 (#238284)

---
 fltk-1.1.x-r5750-rpath.patch | 30 ++++++++++++++++++++++++++++++
 fltk.spec                    |  6 +++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/fltk-1.1.x-r5750-rpath.patch b/fltk-1.1.x-r5750-rpath.patch
index e69de29..820ab1f 100644
--- a/fltk-1.1.x-r5750-rpath.patch
+++ b/fltk-1.1.x-r5750-rpath.patch
@@ -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"
diff --git a/fltk.spec b/fltk.spec
index 2163b05..f605217 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -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 @@ Requires:	%{name}-devel = %{version}-%{release}
 %patch1 -p1 -b .199656
 %patch2 -p1 -b .test
 %patch3 -p1 -b .undefined
+%patch4 -p1 -b .rpath
 
 
 %build
@@ -201,6 +202,9 @@ update-desktop-database >& /dev/null ||:
 
 
 %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)