rpms/cups/devel cups.spec,1.401,1.402

Tim Waugh (twaugh) fedora-extras-commits at redhat.com
Fri Mar 7 17:54:29 UTC 2008


Author: twaugh

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

Modified Files:
	cups.spec 
Log Message:
More adjustments for svn builds.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- cups.spec	5 Mar 2008 16:26:51 -0000	1.401
+++ cups.spec	7 Mar 2008 17:53:50 -0000	1.402
@@ -1,4 +1,4 @@
-#define svn 7356
+#define svn 7370
 %define initdir /etc/rc.d/init.d
 %define use_alternatives 1
 %define lspp 1
@@ -58,6 +58,9 @@
 Provides: /usr/bin/lpq /usr/bin/lpr /usr/bin/lp /usr/bin/cancel /usr/bin/lprm /usr/bin/lpstat
 Prereq: /usr/sbin/alternatives
 %endif
+%if %{?svn:1}%{!?svn:0}
+Requires: poppler-utils
+%endif
 
 # Unconditionally obsolete LPRng so that upgrades work properly.
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
@@ -183,9 +186,8 @@
 %if %lspp
 	--enable-lspp \
 %endif
-	%{?svn:--enable-pdftops} \
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
-	--with-dbusdir=%{_sysconfdir}/dbus-1 \
+	--enable-pdftops --with-dbusdir=%{_sysconfdir}/dbus-1 \
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
@@ -277,6 +279,8 @@
 
 %if %{?svn:1}%{!?svn:0}
 rm -f $RPM_BUILD_ROOT%{_bindir}/ppd{c,html,i,merge,po}
+rm -f $RPM_BUILD_ROOT%{cups_serverbin}/filter/{command,raster}to{escpx,pclx}
+rm -f $RPM_BUILD_ROOT%{cups_serverbin}/driver/drv
 rm -rf $RPM_BUILD_ROOT%{_datadir}/cups/ppdc
 %endif
 




More information about the fedora-extras-commits mailing list