rpms/kdelibs/devel kdelibs-4.1.0-kstandarddirs.patch, NONE, 1.1 kdelibs.spec, 1.366, 1.367 kdelibs-4.0.99-kstandarddirs.patch, 1.1, NONE
Kevin Kofler
kkofler at fedoraproject.org
Thu Aug 28 22:39:18 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16269/devel
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.1.0-kstandarddirs.patch
Removed Files:
kdelibs-4.0.99-kstandarddirs.patch
Log Message:
* Thu Aug 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-8
- rewrite kstandarddirs patch to fix side effects (#459904 (KDEDIRS), #457633)
kdelibs-4.1.0-kstandarddirs.patch:
--- NEW FILE kdelibs-4.1.0-kstandarddirs.patch ---
diff -ur kdelibs-4.1.0/kdecore/kernel/kstandarddirs.cpp kdelibs-4.1.0-kstandarddirs/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.1.0/kdecore/kernel/kstandarddirs.cpp 2008-07-09 15:28:22.000000000 +0200
+++ kdelibs-4.1.0-kstandarddirs/kdecore/kernel/kstandarddirs.cpp 2008-08-29 00:07:51.000000000 +0200
@@ -996,7 +996,9 @@
pit != prefixList->end();
++pit)
{
- if((*pit)!=installprefix||installdir.isEmpty())
+ // "exe" never has a custom install path, and the check triggers
+ // a false positive due to the libexecdir patch
+ if((*pit)!=installprefix||installdir.isEmpty()||!strcmp("exe", type))
{
for (QStringList::ConstIterator it = dirs.begin();
it != dirs.end(); ++it)
@@ -1010,6 +1012,11 @@
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
}
+ // special-case "config" (forward porting Chris Cheney's
+ // hack) - we want /etc/kde after the local config paths
+ // and before the ones in /usr (including kde-profile)
+ if (local && !strcmp("config", type))
+ candidates.append("/etc/kde/");
local = false;
}
else
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- kdelibs.spec 25 Aug 2008 15:53:38 -0000 1.366
+++ kdelibs.spec 28 Aug 2008 22:38:48 -0000 1.367
@@ -2,7 +2,7 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.1.0
-Release: 7%{?dist}
+Release: 8%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -75,8 +75,8 @@
Patch13: kdelibs-4.0.5-fedora-buildtype.patch
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
Patch14: kdelibs-4.0.85-libexecdir.patch
-# kstandarddirs changes: search /etc/kde, change handling of install locations
-Patch18: kdelibs-4.0.99-kstandarddirs.patch
+# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
+Patch18: kdelibs-4.1.0-kstandarddirs.patch
# revert a kinit patch which triggers an assertion failure in KComponentData
# (and its followup) (#455130)
Patch19: kdelibs-4.0.98-revert-kinit-regression.patch
@@ -377,6 +377,9 @@
%changelog
+* Thu Aug 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-8
+- rewrite kstandarddirs patch to fix side effects (#459904 (KDEDIRS), #457633)
+
* Mon Aug 25 2008 Than Ngo <than at redhat.com> 4.1.0-7
- konsole doesn't write to utmp
--- kdelibs-4.0.99-kstandarddirs.patch DELETED ---
More information about the fedora-extras-commits
mailing list