Sync from F8:
Tue Feb 26 2008 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.9-3 - #230979: Writes ServerBin into cupsd.conf - #416101: unable to print after configuring printing in KDE
This commit is contained in:
parent
3a4a047462
commit
a844ece1c1
18
kdelibs-3.5.9-cupsserverbin.patch
Normal file
18
kdelibs-3.5.9-cupsserverbin.patch
Normal file
@ -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";
|
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
Summary: K Desktop Environment 3 - Libraries
|
Summary: K Desktop Environment 3 - Libraries
|
||||||
Version: 3.5.9
|
Version: 3.5.9
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs3
|
Name: kdelibs3
|
||||||
@ -65,6 +65,7 @@ Patch46: kdelibs-3.5.8-kate-vhdl.patch
|
|||||||
Patch48: kdelibs-3.5.8-kspell-hunspell.patch
|
Patch48: kdelibs-3.5.8-kspell-hunspell.patch
|
||||||
Patch49: kdelibs-3.5.8-kspell2-enchant.patch
|
Patch49: kdelibs-3.5.8-kspell2-enchant.patch
|
||||||
Patch50: kdelibs-3.5.8-kspell2-no-ispell.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
|
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
||||||
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
||||||
@ -234,6 +235,7 @@ format for easy browsing
|
|||||||
%patch49 -p1 -b .kspell2
|
%patch49 -p1 -b .kspell2
|
||||||
%patch50 -p1 -b .no-ispell
|
%patch50 -p1 -b .no-ispell
|
||||||
%endif
|
%endif
|
||||||
|
%patch51 -p1 -b .cupsserverbin
|
||||||
|
|
||||||
%patch100 -p1 -b .kstandarddirs
|
%patch100 -p1 -b .kstandarddirs
|
||||||
%patch101 -p1 -b .libtool-shlibext
|
%patch101 -p1 -b .libtool-shlibext
|
||||||
@ -567,6 +569,10 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 26 2008 Lukáš Tinkl <ltinkl@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@tigcc.ticalc.org> - 3.5.9-2
|
* Sat Feb 16 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.9-2
|
||||||
- F9+: include %%{_docdir}/HTML/en/common files which are not in kdelibs-common
|
- F9+: include %%{_docdir}/HTML/en/common files which are not in kdelibs-common
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user