diff --git a/kdelibs-4.1.3-kde#161117.patch b/kdelibs-4.1.3-kde#161117.patch new file mode 100644 index 0000000..57f7587 --- /dev/null +++ b/kdelibs-4.1.3-kde#161117.patch @@ -0,0 +1,28 @@ +--- branches/KDE/4.1/kdelibs/kded/applications.menu 2008/07/09 10:18:33 829867 ++++ branches/KDE/4.1/kdelibs/kded/applications.menu 2008/11/20 18:09:13 886953 +@@ -393,16 +393,16 @@ + Utilities + kde-utilities.directory + +- ++ + Utility +- TextEditor +- Accessibility +- X-KDE-Utilities-Desktop +- X-KDE-Utilities-File +- X-KDE-Utilities-Peripherals +- X-KDE-Utilities-PIM +- X-KDE-More +- ++ X-KDE-More ++ ++ TextEditor ++ Accessibility ++ X-KDE-Utilities-Desktop ++ X-KDE-Utilities-File ++ X-KDE-Utilities-Peripherals ++ X-KDE-Utilities-PIM + + + XUtilities diff --git a/kdelibs.spec b/kdelibs.spec index 62869e7..82f3d5d 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -2,7 +2,7 @@ Summary: K Desktop Environment 4 - Libraries Version: 4.1.3 -Release: 2%{?dist} +Release: 3%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -78,6 +78,8 @@ Patch18: kdelibs-4.1.0-kstandarddirs.patch Patch20: kdelibs-4.1.1-cmake.patch ## upstream patches +# unmess Utilities menu +Patch100: kdelibs-4.1.3-kde#161117.patch Patch103: kdelibs-4.1.2-kde#172182-http_cache_cleaner.patch BuildRequires: qt4-devel >= 4.4.0 @@ -204,6 +206,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage %patch20 -p1 -b .cmake ## upstream patches +%patch100 -p4 -b .kde#161117 %patch103 -p1 -b .kde#172182-http_cache_cleaner @@ -365,6 +368,9 @@ rm -rf %{buildroot} %changelog +* Thu Nov 20 2008 Rex Dieter 4.1.3-3 +- unmess Utilities menu (kdebug:161117) + * Fri Nov 07 2008 Rex Dieter 4.1.3-2 - backport http_cache_cleaner fix (kdebug:172182)