rpms/cups/devel cups.spec,1.198,1.199

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon May 22 14:07:30 UTC 2006


Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11622

Modified Files:
	cups.spec 
Log Message:
* Mon May 22 2006 Tim Waugh <twaugh at redhat.com>
- Added a 'conflicts:' for kdelibs to prevent bug #192548.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- cups.spec	21 May 2006 09:40:42 -0000	1.198
+++ cups.spec	22 May 2006 14:07:25 -0000	1.199
@@ -49,6 +49,9 @@
 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 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 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Sun May 21 2006 Tim Waugh <twaugh at 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 at redhat.com>
+- Added a 'conflicts:' for kdelibs to prevent bug #192548.
 
 * Sat May 20 2006 Tim Waugh <twaugh at redhat.com> 1:1.2.0-6
 - Sync to svn5555.  No longer need str1670 or str1705 patches.




More information about the fedora-cvs-commits mailing list