From 545b076c7a808b88658f5763522570cbbe5b6117 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Feb 14 2008 14:08:32 +0000
Subject: Build with --with-dbusdir.


---

diff --git a/cups.conf b/cups.conf
deleted file mode 100644
index 537ac77..0000000
--- a/cups.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Only root can send this message -->
-  <policy user="root">
-    <allow send_interface="com.redhat.PrinterSpooler"/>
-  </policy>
-
-  <!-- Allow any connection to receive the message -->
-  <policy context="default">
-    <allow receive_interface="com.redhat.PrinterSpooler"/>
-  </policy>
-</busconfig>
diff --git a/cups.spec b/cups.spec
index cd71fc8..194143a 100644
--- a/cups.spec
+++ b/cups.spec
@@ -20,7 +20,6 @@ Source7: pstoraster.convs
 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 @@ export CFLAGS="-DLDAP_DEPRECATED=1"
 	--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 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Thu Feb 14 2008 Tim Waugh <twaugh@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@redhat.com> 1:1.3.5-5