rpms/ghostscript/devel ghostscript-build.patch, 1.3, 1.4 ghostscript.spec, 1.63, 1.64

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2699

Modified Files:
	ghostscript-build.patch ghostscript.spec 
Log Message:
More build fixes.

ghostscript-build.patch:
 devs.mak     |    2 +-
 lib.mak      |    2 +-
 unix-dll.mak |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: ghostscript-build.patch
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ghostscript-build.patch	3 Jun 2005 17:21:32 -0000	1.3
+++ ghostscript-build.patch	3 Jun 2005 22:13:52 -0000	1.4
@@ -9,3 +9,25 @@
  
  # Debug shared object
  # Note that this is in the same directory as the normal shared
+--- espgs-8.15rc3/src/devs.mak.build	2005-06-03 22:41:16.000000000 +0100
++++ espgs-8.15rc3/src/devs.mak	2005-06-03 22:42:54.000000000 +0100
+@@ -457,7 +457,7 @@
+ 	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevx.$(OBJ) $(C_) $(GLSRC)gdevx.c
+ 
+ $(GLOBJ)gdevxcmp.$(OBJ) : $(GLSRC)gdevxcmp.c $(GDEVX) $(math__h)
+-	$(GLCC) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
++	$(GLCCSHARED) $(XINCLUDE) $(GLO_)gdevxcmp.$(OBJ) $(C_) $(GLSRC)gdevxcmp.c
+ 
+ $(GLOBJ)gdevxini.$(OBJ) : $(GLSRC)gdevxini.c $(GDEVX) $(memory__h)\
+  $(gserrors_h) $(gsparamx_h) $(gxdevmem_h) $(gdevbbox_h)
+--- espgs-8.15rc3/src/lib.mak.build	2005-06-03 22:51:22.000000000 +0100
++++ espgs-8.15rc3/src/lib.mak	2005-06-03 22:52:11.000000000 +0100
+@@ -847,7 +847,7 @@
+ $(GLOBJ)gsparamx.$(OBJ) : $(GLSRC)gsparamx.c $(string__h)\
+  $(gserror_h) $(gserrors_h) $(gsmemory_h) $(gsparam_h) $(gsparamx_h)\
+  $(gstypes_h)
+-	$(GLCC) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
++	$(GLCCSHARED) $(GLO_)gsparamx.$(OBJ) $(C_) $(GLSRC)gsparamx.c
+ 
+ # Future replacement for gsparams.c
+ $(GLOBJ)gsparam2.$(OBJ) : $(GLSRC)gsparam2.c $(GXERR) $(memory__h)\


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ghostscript.spec	3 Jun 2005 17:21:32 -0000	1.63
+++ ghostscript.spec	3 Jun 2005 22:13:52 -0000	1.64
@@ -120,6 +120,7 @@
 	docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver} \
 	gsdir=$RPM_BUILD_ROOT%{_datadir}/%{name} \
 	gsdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver} \
+	gssharedir=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{gs_ver} \
 	CUPSSERVER=$RPM_BUILD_ROOT`cups-config --serverbin` \
 	CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \
 	CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir`
@@ -145,6 +146,10 @@
 install -m0644 src/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 install -m0644 src/gdevdsp.h $RPM_BUILD_ROOT%{_includedir}/ghostscript
 
+# Don't ship pkgconfig files.  Note: this always gets installed in /usr/lib
+# regardless of multilib.
+rm -f $RPM_BUILD_ROOT/usr/lib/pkgconfig/ijs.pc
+
 # Don't ship ijs example client or server
 rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_{client,server}_example
 
@@ -185,6 +190,7 @@
 %{_libdir}/libgs.so.*
 %{_libdir}/libgs.so
 %{_libdir}/libijs*.so*
+%{_libdir}/%{name}/%{gs_ver}
 %{_libdir}/cups/filter/pstopxl
 %{_datadir}/cups/model/pxl*
 
@@ -200,7 +206,6 @@
 %{_includedir}/ijs/*
 %{_bindir}/ijs-config
 %{_libdir}/libijs.*a
-%{_libdir}/pkgconfig/ijs.pc
 
 %post -p /sbin/ldconfig