* Mon Mar 31 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.0.3-3
- patch and update file list for _kde4_libexecdir
This commit is contained in:
parent
9fdf9a0fc1
commit
c4370153ce
57
kdelibs-4.0.3-libexecdir.patch
Normal file
57
kdelibs-4.0.3-libexecdir.patch
Normal file
@ -0,0 +1,57 @@
|
||||
diff -ur kdelibs-4.0.3/kdecore/kernel/kstandarddirs.cpp kdelibs-4.0.3-libexecdir/kdecore/kernel/kstandarddirs.cpp
|
||||
--- kdelibs-4.0.3/kdecore/kernel/kstandarddirs.cpp 2008-03-27 21:33:34.000000000 +0100
|
||||
+++ kdelibs-4.0.3-libexecdir/kdecore/kernel/kstandarddirs.cpp 2008-03-31 18:07:10.000000000 +0200
|
||||
@@ -1585,7 +1585,7 @@
|
||||
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
|
||||
index+=2;
|
||||
}
|
||||
- addResourceType("exe", "lib", "kde4/libexec", true );
|
||||
+ addResourceType("exe", 0, "libexec/kde4", true );
|
||||
|
||||
addResourceDir("home", QDir::homePath(), false);
|
||||
}
|
||||
diff -ur kdelibs-4.0.3/kdecore/kernel/kstandarddirs_unix.cpp kdelibs-4.0.3-libexecdir/kdecore/kernel/kstandarddirs_unix.cpp
|
||||
--- kdelibs-4.0.3/kdecore/kernel/kstandarddirs_unix.cpp 2008-03-27 21:27:35.000000000 +0100
|
||||
+++ kdelibs-4.0.3-libexecdir/kdecore/kernel/kstandarddirs_unix.cpp 2008-03-31 17:54:58.000000000 +0200
|
||||
@@ -62,7 +62,7 @@
|
||||
if (strcmp("lib", type) == 0)
|
||||
return QString::fromLatin1(LIB_INSTALL_DIR "/");
|
||||
if (strcmp("libexec", type) == 0)
|
||||
- return QString::fromLatin1(KDEDIR "/lib" KDELIBSUFF "/kde4/libexec/");
|
||||
+ return QString::fromLatin1(LIBEXEC_INSTALL_DIR "/");
|
||||
if (strcmp("locale", type) == 0)
|
||||
return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
|
||||
break;
|
||||
diff -ur kdelibs-4.0.3/kdecore/tests/kstandarddirstest.cpp kdelibs-4.0.3-libexecdir/kdecore/tests/kstandarddirstest.cpp
|
||||
--- kdelibs-4.0.3/kdecore/tests/kstandarddirstest.cpp 2008-03-27 21:33:34.000000000 +0100
|
||||
+++ kdelibs-4.0.3-libexecdir/kdecore/tests/kstandarddirstest.cpp 2008-03-31 17:54:58.000000000 +0200
|
||||
@@ -69,7 +69,7 @@
|
||||
#endif
|
||||
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
|
||||
QVERIFY( !bin.isEmpty() );
|
||||
- QVERIFY( bin.endsWith( "kde4/libexec/kioslave" EXT ) );
|
||||
+ QVERIFY( bin.endsWith( "kde4/libexec/kioslave" EXT ) || bin.endsWith( "libexec/kde4/kioslave" EXT ) );
|
||||
QVERIFY( !QDir::isRelativePath(bin) );
|
||||
|
||||
const QString data = KGlobal::dirs()->findResource( "data", "katepart/syntax/sql.xml" );
|
||||
@@ -164,7 +164,7 @@
|
||||
// findExe with a result in libexec
|
||||
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
|
||||
QVERIFY( !lnusertemp.isEmpty() );
|
||||
- QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) );
|
||||
+ QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) );
|
||||
|
||||
// Check the "exe" resource too
|
||||
QCOMPARE( KGlobal::dirs()->realFilePath(kdeinit),
|
||||
diff -ur kdelibs-4.0.3/kio/tests/krununittest.cpp kdelibs-4.0.3-libexecdir/kio/tests/krununittest.cpp
|
||||
--- kdelibs-4.0.3/kio/tests/krununittest.cpp 2008-03-27 21:27:16.000000000 +0100
|
||||
+++ kdelibs-4.0.3-libexecdir/kio/tests/krununittest.cpp 2008-03-31 17:54:58.000000000 +0200
|
||||
@@ -139,7 +139,7 @@
|
||||
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
|
||||
if (!kdeinit.isEmpty()) {
|
||||
QVERIFY(!kmailservice.isEmpty());
|
||||
- QVERIFY(kmailservice.contains("kde4/libexec"));
|
||||
+ QVERIFY(kmailservice.contains("kde4/libexec") || kmailservice.contains("libexec/kde4"));
|
||||
}
|
||||
|
||||
QTest::newRow("%U l0") << "kdeinit4 %U" << l0 << false << kdeinit;
|
10
kdelibs.spec
10
kdelibs.spec
@ -1,7 +1,7 @@
|
||||
|
||||
Summary: K Desktop Environment 4 - Libraries
|
||||
Version: 4.0.3
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs
|
||||
@ -77,6 +77,8 @@ Patch11: kdelibs-4.0.2-policykit-workaround.patch
|
||||
Patch12: kdelibs-4.x-xdg-menu.patch
|
||||
# Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
|
||||
Patch13: kdelibs-4.0.3-fedora-buildtype.patch
|
||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||
Patch14: kdelibs-4.0.3-libexecdir.patch
|
||||
|
||||
BuildRequires: qt4-devel >= 4.3.0
|
||||
Requires: qt4 >= %{_qt4_version}
|
||||
@ -195,6 +197,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
||||
%patch11 -p1 -b .policykit
|
||||
%patch12 -p1 -b .Administration-menu
|
||||
%patch13 -p1 -b .fedora-buildtype
|
||||
%patch14 -p1 -b .libexecdir
|
||||
|
||||
|
||||
%build
|
||||
@ -307,7 +310,7 @@ rm -rf %{buildroot}
|
||||
%{_kde4_libdir}/libkdeinit4_*.so
|
||||
%dir %{_kde4_libdir}/kde4/
|
||||
%{_kde4_libdir}/kde4/*.so
|
||||
%{_kde4_libdir}/kde4/libexec/
|
||||
%{_kde4_libexecdir}/*
|
||||
%dir %{_kde4_libdir}/kde4/plugins/
|
||||
%{_kde4_libdir}/kde4/plugins/imageformats/
|
||||
%{_kde4_libdir}/kde4/plugins/phonon_platform/
|
||||
@ -355,6 +358,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 31 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.0.3-3
|
||||
- patch and update file list for _kde4_libexecdir
|
||||
|
||||
* Mon Mar 31 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.0.3-2
|
||||
- add Fedora build type (uses -DNDEBUG)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user