rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Thu Nov 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.3-3 

- unmess Utilities menu (kdebug:161117)
This commit is contained in:
Rex Dieter 2008-11-20 18:22:53 +00:00
parent 901e62dbb3
commit 6dcb092b70
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kdelibs-4.1.3-kde#161117.patch Normal file
View File

@ -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 @@
<Name>Utilities</Name>
<Directory>kde-utilities.directory</Directory>
<Include>
- <Or>
+ <And>
<Category>Utility</Category>
- <Category>TextEditor</Category>
- <Category>Accessibility</Category>
- <Category>X-KDE-Utilities-Desktop</Category>
- <Category>X-KDE-Utilities-File</Category>
- <Category>X-KDE-Utilities-Peripherals</Category>
- <Category>X-KDE-Utilities-PIM</Category>
- <Category>X-KDE-More</Category>
- </Or>
+ <Not><Category>X-KDE-More</Category></Not>
+ </And>
+ <Category>TextEditor</Category>
+ <Category>Accessibility</Category>
+ <Category>X-KDE-Utilities-Desktop</Category>
+ <Category>X-KDE-Utilities-File</Category>
+ <Category>X-KDE-Utilities-Peripherals</Category>
+ <Category>X-KDE-Utilities-PIM</Category>
</Include>
<Menu>
<Name>XUtilities</Name>

8
kdelibs.spec
View File

@ -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 <rdieter@fedoraproject.org> 4.1.3-3
- unmess Utilities menu (kdebug:161117)
* Fri Nov 07 2008 Rex Dieter <rdieter@fedoraproject.org> 4.1.3-2
- backport http_cache_cleaner fix (kdebug:172182)