rpms/cupsddk/devel cupsddk-build.patch, NONE, 1.1 cupsddk.spec, 1.4, 1.5

Tim Waugh (twaugh) fedora-extras-commits at redhat.com
Tue Oct 2 10:48:21 UTC 2007


Author: twaugh

Update of /cvs/pkgs/rpms/cupsddk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25224

Modified Files:
	cupsddk.spec 
Added Files:
	cupsddk-build.patch 
Log Message:
Fix build.

cupsddk-build.patch:

--- NEW FILE cupsddk-build.patch ---
diff -up cupsddk-1.2.2/ppdc/Makefile.build cupsddk-1.2.2/ppdc/Makefile
--- cupsddk-1.2.2/ppdc/Makefile.build	2007-10-02 11:45:54.000000000 +0100
+++ cupsddk-1.2.2/ppdc/Makefile	2007-10-02 11:46:41.000000000 +0100
@@ -143,13 +143,13 @@ ppdc:			ppdc.o libppdc.a ../cups/libcups
 
 
 ppdc-static:		ppdc.o libppdc.a ../cups/libcupsdriver.a \
-			foo.drv foo-fr.po
+			foo.drv
 	echo Linking $@...
 	$(CXX) $(LDFLAGS) -o ppdc-static ppdc.o libppdc.a \
 		../cups/libcupsdriver.a $(CUPSLIBS_ST) $(LIBS)
 	echo Testing PPD compiler...
-	./ppdc-static -l en,fr -I ../data foo.drv
-	./ppdc-static -l en,fr -z -I ../data foo.drv
+	./ppdc-static -I ../data foo.drv
+	./ppdc-static -z -I ../data foo.drv
 
 
 #


Index: cupsddk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cupsddk/devel/cupsddk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cupsddk.spec	2 Oct 2007 09:45:38 -0000	1.4
+++ cupsddk.spec	2 Oct 2007 10:47:45 -0000	1.5
@@ -23,6 +23,7 @@
 Patch0: cupsddk-no-gzip-man-pages.patch
 Patch1: cupsddk-smp-build.patch
 Patch2: cupsddk-no-strip.patch
+Patch3: cupsddk-build.patch
 Url: http://www.cups.org/ddk/
 
 # Use buildroot so as not to disturb the version already installed
@@ -64,6 +65,7 @@
 %patch0 -p1 -z .no-gzip-man-pages
 %patch1 -p1 -z .smp-build
 %patch2 -p1 -z .no-strip
+%patch3 -p1 -z .build
 
 %build
 %configure --with-optim="$RPM_OPT_FLAGS"
@@ -114,7 +116,7 @@
 
 %changelog
 * Tue Oct  2 2007 Tim Waugh <twaugh at redhat.com> 1.2.2-1
-- 1.2.2.
+- 1.2.2 (with patch to fix build).
 
 * Sat Sep 29 2007 Tim Waugh <twaugh at redhat.com> 1.2.1-1
 - 1.2.1.




More information about the fedora-extras-commits mailing list