rpms/ghostscript/F-11 ghostscript-ldflags.patch, NONE, 1.1 ghostscript.spec, 1.199, 1.200

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16109

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-ldflags.patch 
Log Message:
* Fri Feb 19 2010 Tim Waugh <twaugh at redhat.com> 8.71-2
- Fixed LDFLAGS when building dynamically linked executables (bug #565935).


ghostscript-ldflags.patch:
 unix-dll.mak |    3 ++-
 unixlink.mak |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE ghostscript-ldflags.patch ---
diff -up ghostscript-8.71/base/unix-dll.mak.ldflags ghostscript-8.71/base/unix-dll.mak
--- ghostscript-8.71/base/unix-dll.mak.ldflags	2009-10-19 21:24:53.000000000 +0100
+++ ghostscript-8.71/base/unix-dll.mak	2010-02-19 10:07:06.645044318 +0000
@@ -88,8 +88,9 @@ $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOAD
 
 # ------------------------- Recursive make targets ------------------------- #
 
-SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\
+SODEFS=\
  GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
+ GS_XE_LDFLAGS=$(LDFLAGS_SO)\
  STDIO_IMPLEMENTATION=c\
  DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
  BINDIR=$(BINDIR)/$(SOBINRELDIR)\
diff -up ghostscript-8.71/base/unixlink.mak.ldflags ghostscript-8.71/base/unixlink.mak
--- ghostscript-8.71/base/unixlink.mak.ldflags	2008-02-29 08:13:08.000000000 +0000
+++ ghostscript-8.71/base/unixlink.mak	2010-02-19 10:07:06.646044276 +0000
@@ -50,7 +50,7 @@ $(GS_A): $(obj_tr) $(ECHOGS_XE) $(INT_AR
 # which has limited environment space.
 ldt_tr=$(PSOBJ)ldt.tr
 $(GS_XE): $(ld_tr) $(ECHOGS_XE) $(XE_ALL) $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ)
-	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(LDFLAGS) -o $(GS_XE)
+	$(ECHOGS_XE) -w $(ldt_tr) -n - $(CCLD) $(GS_XE_LDFLAGS) $(LDFLAGS) -o $(GS_XE)
 	$(ECHOGS_XE) -a $(ldt_tr) -n -s $(PSOBJ)gsromfs$(COMPILE_INITS).$(OBJ) $(PSOBJ)gs.$(OBJ) -s
 	cat $(ld_tr) >>$(ldt_tr)
 	$(ECHOGS_XE) -a $(ldt_tr) -s - $(EXTRALIBS) $(STDLIBS)


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-11/ghostscript.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- ghostscript.spec	17 Feb 2010 17:33:59 -0000	1.199
+++ ghostscript.spec	19 Feb 2010 11:25:48 -0000	1.200
@@ -5,7 +5,7 @@ Summary: A PostScript interpreter and re
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -28,6 +28,7 @@ Patch9: ghostscript-gs-executable.patch
 Patch10: ghostscript-CVE-2009-4270.patch
 Patch11: ghostscript-vsnprintf.patch
 Patch12: ghostscript-pdftoraster-exit.patch
+Patch13: ghostscript-ldflags.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: xz
@@ -127,6 +128,9 @@ rm -rf libpng zlib jpeg jasper
 # Fixed pdftoraster so that it waits for its sub-process to exit.
 %patch12 -p1 -b .pdftoraster-exit
 
+# Fixed LDFLAGS when building dynamically linked executables (bug #565935).
+%patch13 -p1 -b .ldflags
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -308,6 +312,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Fri Feb 19 2010 Tim Waugh <twaugh at redhat.com> 8.71-2
+- Fixed LDFLAGS when building dynamically linked executables (bug #565935).
+
 * Wed Feb 17 2010 Tim Waugh <twaugh at redhat.com> 8.71-1
 - 8.71 (bug #565935).