rpms/kdelibs/devel kdelibs-3.5.2-cupsdconf2-group.patch, NONE, 1.1 kdelibs.spec, 1.136, 1.137

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12980

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.2-cupsdconf2-group.patch 
Log Message:
fix #192585, kdeprint writes incorrect cupsd.conf


kdelibs-3.5.2-cupsdconf2-group.patch:
 cupsd.conf.template |    4 ++--
 cupsdconf.cpp       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.2-cupsdconf2-group.patch ---
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template.tn	2006-05-22 14:51:46.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsd.conf.template	2006-05-22 15:27:27.000000000 +0200
@@ -275,9 +275,9 @@
 # must be <b>sys</b>, however you can configure things for another
 # group as needed.</p>
 # <p>
-# <i>ex</i>: sys</p>
+# <i>ex</i>: lp</p>
 $$
-#Group sys
+#Group lp
 @@
 
 %%ripcache
--- kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp.tn	2006-05-22 15:26:15.000000000 +0200
+++ kdelibs-3.5.2/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2006-05-22 15:26:32.000000000 +0200
@@ -115,7 +115,7 @@
 	maxjobsperprinter_ = 0;
 	maxjobsperuser_ = 0;
 	user_ = "lp";
-	group_ = "sys";
+	group_ = "lp";
 	ripcache_ = "8m";
 	filterlimit_ = 0;
 	browsing_ = true;


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- kdelibs.spec	18 May 2006 14:06:30 -0000	1.136
+++ kdelibs.spec	22 May 2006 13:38:34 -0000	1.137
@@ -24,7 +24,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 3.5.2
-Release: 5
+Release: 6
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -52,6 +52,7 @@
 Patch35: kdelibs-3.4.92-inttype.patch
 Patch36: kdelibs-3.5.0-modular-x.patch
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
+Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
 # upstream patches
 patch100: kdelibs-3.5.2-kdeprint.patch
@@ -185,6 +186,7 @@
 %patch35 -p1 -b .inttype
 %patch36 -p1 -b .modular-x
 %patch37 -p1 -b .kdebug-kmail-quiet
+%patch38 -p1 -b .cupsdconf2-group
 
 # upstream patches
 %patch100 -p1 -b .kdeprint
@@ -391,6 +393,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Mon May 22 2006 Than Ngo <than at redhat.com> 6:3.5.2-6
+- fix #192585, kdeprint writes incorrect cupsd.conf
+
 * Thu May 18 2006 Than Ngo <than at redhat.com> 6:3.5.2-5
 - use a versioned Obsoletes for kdelibs-docs