rpms/cups/devel cups.spec,1.390,1.391 cups.conf,1.2,NONE

[Tim Waugh (twaugh)]

Author: twaugh

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

Modified Files:
	cups.spec 
Removed Files:
	cups.conf 
Log Message:
Build with --with-dbusdir.


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.390
retrieving revision 1.391
diff -u -r1.390 -r1.391
--- cups.spec	14 Feb 2008 13:26:01 -0000	1.390
+++ cups.spec	14 Feb 2008 14:08:32 -0000	1.391
@@ -20,7 +20,6 @@
 Source8: postscript.ppd.gz
 Source9: cups.logrotate
 Source10: ncp.backend
-Source11: cups.conf
 Source12: cups.cron
 Source13: pdftops.conf
 Source14: textonly.filter
@@ -186,6 +185,7 @@
 	--enable-lspp \
 %endif
 	--with-log-file-perm=0600 --enable-pie --enable-relro \
+	--with-dbusdir=%{_sysconfig}/dbus-1/system.d \
 	localedir=%{_datadir}/locale
 
 # If we got this far, all prerequisite libraries must be here.
@@ -459,6 +459,7 @@
 %changelog
 * Thu Feb 14 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.5-6
 - Include fixes from svn up to revision 7304.  No longer need str2703 patch.
+  Build with --with-dbusdir.
 - Try out logrotate again (bug #432730).
 
 * Tue Feb 12 2008 Tim Waugh <twaugh at redhat.com> 1:1.3.5-5


--- cups.conf DELETED ---