rpms/kdelibs3/devel kdelibs-3.5.9-cupsserverbin.patch, NONE, 1.1 kdelibs3.spec, 1.17, 1.18

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	kdelibs3.spec 
Added Files:
	kdelibs-3.5.9-cupsserverbin.patch 
Log Message:
Sync from F8:

* Tue Feb 26 2008 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.9-3
- #230979: Writes ServerBin into cupsd.conf
- #416101: unable to print after configuring printing in KDE

kdelibs-3.5.9-cupsserverbin.patch:

--- NEW FILE kdelibs-3.5.9-cupsserverbin.patch ---
diff -ur kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.9/kdeprint/cups/cupsdconf2/cupsdconf.cpp
--- kdelibs-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2005-10-10 17:06:30.000000000 +0200
+++ kdelibs-3.5.9/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2008-02-26 15:03:47.000000000 +0100
@@ -71,10 +71,10 @@
 	//fontpath_ << (datadir_+"/fonts");
 	requestdir_ = findDir(QStringList("/var/spool/cups")
 			<< "/var/cups");
-	serverbin_ = findDir(QStringList("/usr/lib" KDELIBSUFF "/cups")
-			<< "/usr/local/lib" KDELIBSUFF "/cups"
-			<< "/opt/lib" KDELIBSUFF "/cups"
-			<< "/opt/local/lib" KDELIBSUFF "/cups");
+	serverbin_ = findDir(QStringList("/usr/lib/cups")
+			<< "/usr/local/lib/cups"
+			<< "/opt/lib/cups"
+			<< "/opt/local/lib/cups");
 	serverfiles_ = findDir(QStringList("/etc/cups")
 			<< "/usr/local/etc/cups");
 	tmpfiles_ = requestdir_+"/tmp";


Index: kdelibs3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs3/devel/kdelibs3.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kdelibs3.spec	16 Feb 2008 01:54:38 -0000	1.17
+++ kdelibs3.spec	27 Feb 2008 08:34:09 -0000	1.18
@@ -21,7 +21,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -65,6 +65,7 @@
 Patch48: kdelibs-3.5.8-kspell-hunspell.patch
 Patch49: kdelibs-3.5.8-kspell2-enchant.patch
 Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
+Patch51: kdelibs-3.5.9-cupsserverbin.patch
 
 # use /etc/kde in addition to /usr/share/config, borrowed from debian
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
@@ -234,6 +235,7 @@
 %patch49 -p1 -b .kspell2
 %patch50 -p1 -b .no-ispell
 %endif
+%patch51 -p1 -b .cupsserverbin
 
 %patch100 -p1 -b .kstandarddirs
 %patch101 -p1 -b .libtool-shlibext
@@ -567,6 +569,10 @@
 
 
 %changelog
+* Tue Feb 26 2008 Lukáš Tinkl <ltinkl at redhat.com> - 3.5.9-3
+- #230979: Writes ServerBin into cupsd.conf
+- #416101: unable to print after configuring printing in KDE
+
 * Sat Feb 16 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.9-2
 - F9+: include %%{_docdir}/HTML/en/common files which are not in kdelibs-common