rpms/cups/devel cups-rpath.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23590

Modified Files:
	cups-rpath.patch 
Log Message:
Won't be accepted upstream (STR #1615) so simplify

cups-rpath.patch:
 cups-sharedlibs.m4 |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Index: cups-rpath.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups-rpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-rpath.patch	28 Apr 2006 13:32:35 -0000	1.1
+++ cups-rpath.patch	28 Apr 2006 14:47:20 -0000	1.2
@@ -8,32 +8,6 @@
  
  if test x$enable_shared != xno; then
  	case "$uname" in
-@@ -45,7 +46,11 @@
- 			LIBCUPS="libcups.so.2"
- 			LIBCUPSIMAGE="libcupsimage.so.2"
- 			DSO="\$(CC)"
--			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
-+			RPATH=""
-+			if test x$enable_rpath != xno; then
-+			  RPATH=",-rpath,\$(libdir)"
-+			fi
-+			DSOFLAGS="$DSOFLAGS -Wl$RPATH,-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
- 			;;
- 		OSF1* | Linux | GNU | *BSD*)
- 			LIBCUPS="libcups.so.2"
-@@ -63,7 +68,11 @@
- 			LIBCUPS="libcups_s.a"
- 			LIBCUPSIMAGE="libcupsimage_s.a"
- 			DSO="\$(CC)"
--			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
-+			RPATH=""
-+			if test x$enable_rpath != xno; then
-+			  RPATH=",-blibpath:\$(libdir)"
-+			fi
-+			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry$RPATH"
- 			;;
- 		*)
- 			echo "Warning: shared libraries may not be supported.  Trying -shared"
 @@ -116,7 +125,7 @@
  	# The *BSD, HP-UX, and Solaris run-time linkers need help when
  	# deciding where to find a DSO.  Add linker options to tell them