jreznik pushed to kdelibs3 (epel7). "Sync from F8: (..more)"

[notifications at fedoraproject.org]

>From a844ece1c197d8be2a770a46336e5129b0e81b05 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler at fedoraproject.org>
Date: Wed, 27 Feb 2008 08:34:09 +0000
Subject: =?UTF-8?q?Sync=20from=20F8:=20Tue=20Feb=2026=202008=20Luk=C3=A1?=
 =?UTF-8?q?=C5=A1=20Tinkl=20<ltinkl at redhat.com>=20-=203.5.9-3=20-=20#23097?=
 =?UTF-8?q?9:=20Writes=20ServerBin=20into=20cupsd.conf=20-=20#416101:=20un?=
 =?UTF-8?q?able=20to=20print=20after=20configuring=20printing=20in=20KDE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit


diff --git a/kdelibs-3.5.9-cupsserverbin.patch b/kdelibs-3.5.9-cupsserverbin.patch
new file mode 100644
index 0000000..f69db91
--- /dev/null
+++ b/kdelibs-3.5.9-cupsserverbin.patch
@@ -0,0 +1,18 @@
+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";
diff --git a/kdelibs3.spec b/kdelibs3.spec
index 281c91b..0ee1085 100644
--- a/kdelibs3.spec
+++ b/kdelibs3.spec
@@ -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 @@ Patch46: kdelibs-3.5.8-kate-vhdl.patch
 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 @@ format for easy browsing
 %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 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 
 
 %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
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kdelibs3.git/commit/?h=epel7&id=a844ece1c197d8be2a770a46336e5129b0e81b05