From fb731fd8762ca9483e591690d8452e88ef654c05 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 22 May 2006 14:07:25 +0000
Subject: [PATCH] - Added a 'conflicts:' for kdelibs to prevent bug #192548.

---
 cups.spec | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/cups.spec b/cups.spec
index 66ddf46..614fa42 100644
--- a/cups.spec
+++ b/cups.spec
@@ -49,6 +49,9 @@ Prereq: /usr/sbin/alternatives
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
 Provides: lpd lpr LPRng = 3.8.15-3
 
+# kdelibs conflict for bug #192585.
+Conflicts: kdelibs < 6:3.5.2-6
+
 BuildPrereq: pam-devel pkgconfig
 BuildPrereq: gnutls-devel libacl-devel
 BuildRequires: openldap-devel
@@ -176,11 +179,6 @@ install -c -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/cups
 install -c -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/cups/pdftops.conf
 ln -s ../doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 
-# Make the parallel backend run as root, at least until KDEPrint is fixed
-# not to incorrectly write 'Group sys' into cupsd.conf (bug #192548,
-# bug #192585).
-chmod 0700 $RPM_BUILD_ROOT%{cups_serverbin}/backend/parallel
-
 # Deal with users trying to access the admin tool at
 # /usr/share/doc/cups-%{version}/index.html rather than the
 # correct http://localhost:631/
@@ -381,10 +379,8 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Sun May 21 2006 Tim Waugh <twaugh@redhat.com>
-- Make the parallel backend run as root, at least until KDEPrint is fixed
-  not to incorrectly write 'Group sys' into cupsd.conf (bug #192548,
-  bug #192585).
+* Mon May 22 2006 Tim Waugh <twaugh@redhat.com>
+- Added a 'conflicts:' for kdelibs to prevent bug #192548.
 
 * Sat May 20 2006 Tim Waugh <twaugh@redhat.com> 1:1.2.0-6
 - Sync to svn5555.  No longer need str1670 or str1705 patches.