diff --git a/kdelibs-4.0.72-xdg-menu.patch b/kdelibs-4.1.0-xdg-menu.patch similarity index 52% rename from kdelibs-4.0.72-xdg-menu.patch rename to kdelibs-4.1.0-xdg-menu.patch index a288c57..fa87400 100644 --- a/kdelibs-4.0.72-xdg-menu.patch +++ b/kdelibs-4.1.0-xdg-menu.patch @@ -1,15 +1,31 @@ -diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/applications.menu ---- kdelibs-4.0.72/kded/applications.menu 2008-03-26 22:10:55.000000000 +0100 -+++ kdelibs-4.0.72-xdg-menu/kded/applications.menu 2008-05-02 02:49:25.000000000 +0200 -@@ -31,6 +31,7 @@ +diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applications.menu +--- kdelibs-4.1.0/kded/applications.menu 2008-05-21 13:07:34.000000000 +0200 ++++ kdelibs-4.1.0-xdg-menu/kded/applications.menu 2008-08-23 09:45:03.000000000 +0200 +@@ -31,29 +31,31 @@ Core KDE + X-Red-Hat-Base X-SuSE-YaST - X-KDE-settings-hardware -@@ -54,6 +55,24 @@ +- X-KDE-settings-hardware +- X-KDE-settings-accessibility +- X-KDE-settings-components +- X-KDE-settings-desktop +- X-KDE-settings-looknfeel +- X-KDE-settings-network +- X-KDE-settings-webbrowsing +- X-KDE-settings-peripherals +- X-KDE-settings-hardware +- X-KDE-settings-power +- X-KDE-settings-security +- X-KDE-settings-sound +- X-KDE-settings-system +- X-KDE-information +- kde-kcm_knetworkconfmodule_ss.desktop +- kde-medianotifications.desktop +- kde-audioencoding.desktop + @@ -34,7 +50,7 @@ diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/appl Development kde-development.directory -@@ -358,7 +377,11 @@ +@@ -358,7 +360,11 @@ Settingsmenu kde-settingsmenu.directory @@ -47,7 +63,7 @@ diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/appl -@@ -367,7 +390,9 @@ +@@ -367,7 +373,9 @@ System diff --git a/kdelibs.spec b/kdelibs.spec index 7cecd59..062221d 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.0 -Release: 5%{?dist} +Release: 6%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -70,7 +70,7 @@ Patch9: kdelibs-4.0.2-branding.patch Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch # workaround for policykit Patch11: kdelibs-4.0.2-policykit-workaround.patch -Patch12: kdelibs-4.0.72-xdg-menu.patch +Patch12: kdelibs-4.1.0-xdg-menu.patch # Fedora build type - adds -DNDEBUG -DQT_NO_DEBUG, removes -O2 -g (already in RPM_OPT_FLAGS) Patch13: kdelibs-4.0.5-fedora-buildtype.patch # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec @@ -376,6 +376,10 @@ rm -rf %{buildroot} %changelog +* Sat Aug 23 2008 Kevin Kofler 4.1.0-6 +- don't hide KDE 3 KCMs in kde4-applications.menu, not needed with our + OnlyShowIn=KDE3 patch and breaks KDE 3 kcmshell in KDE 4 sessions + * Sun Aug 10 2008 Kevin Kofler 4.1.0-5 - fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure)