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

* Sat Aug 23 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 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
This commit is contained in:
Kevin Kofler 2008-08-23 07:48:48 +00:00
parent af44d5b92c
commit 0e1b0d5ebe
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kdelibs-4.0.72-xdg-menu.patch → kdelibs-4.1.0-xdg-menu.patch
View File

@ -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 @@
<Category>Core</Category>
<Not><Category>KDE</Category></Not>
</And>
+ <Category>X-Red-Hat-Base</Category>
<!-- Don't list SUSE's YaST in here -->
<Category>X-SuSE-YaST</Category>
<Category>X-KDE-settings-hardware</Category>
@@ -54,6 +55,24 @@
- <Category>X-KDE-settings-hardware</Category>
- <Category>X-KDE-settings-accessibility</Category>
- <Category>X-KDE-settings-components</Category>
- <Category>X-KDE-settings-desktop</Category>
- <Category>X-KDE-settings-looknfeel</Category>
- <Category>X-KDE-settings-network</Category>
- <Category>X-KDE-settings-webbrowsing</Category>
- <Category>X-KDE-settings-peripherals</Category>
- <Category>X-KDE-settings-hardware</Category>
- <Category>X-KDE-settings-power</Category>
- <Category>X-KDE-settings-security</Category>
- <Category>X-KDE-settings-sound</Category>
- <Category>X-KDE-settings-system</Category>
- <Category>X-KDE-information</Category>
- <Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
- <Filename>kde-medianotifications.desktop</Filename>
- <Filename>kde-audioencoding.desktop</Filename>
</Not>
</Include>
</Menu>
<Menu>
@ -34,7 +50,7 @@ diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/appl
<Name>Development</Name>
<Directory>kde-development.directory</Directory>
<Menu>
@@ -358,7 +377,11 @@
@@ -358,7 +360,11 @@
<Name>Settingsmenu</Name>
<Directory>kde-settingsmenu.directory</Directory>
<Include>
@ -47,7 +63,7 @@ diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/appl
</Include>
</Menu>
<Menu>
@@ -367,7 +390,9 @@
@@ -367,7 +373,9 @@
<Include>
<And>
<Category>System</Category>

8
kdelibs.spec
View File

@ -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 <Kevin@tigcc.ticalc.org> 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 <Kevin@tigcc.ticalc.org> 4.1.0-5
- fix kcookiejar crash on invalid cookie file from KDE 3 (patch by David Faure)