* Tue May 10 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.2-5

- Apply the xdg-menu patch everywhere again (#703531)
- Requires: redhat-menus (proper fix for #701693)

kdelibs-4.6.2-uri_mimetypes.patch

@@ -1,110 +0,0 @@
-diff --git a/kio/misc/mms.protocol b/kio/misc/mms.protocol
-index 286ccd8..e8afbdb 100644
---- a/kio/misc/mms.protocol
-+++ b/kio/misc/mms.protocol
-@@ -1,7 +1,7 @@
- [Protocol]
- helper=true
- exec=
--defaultMimetype=uri/mms
-+defaultMimetype=x-scheme-handler/mms
- protocol=mms
- input=none
- output=none
-diff --git a/kio/misc/mmst.protocol b/kio/misc/mmst.protocol
-index 1f0f763..455694a 100644
---- a/kio/misc/mmst.protocol
-+++ b/kio/misc/mmst.protocol
-@@ -1,5 +1,5 @@
- [Protocol]
--defaultMimetype=uri/mmst
-+defaultMimetype=x-scheme-handler/mmst
- exec=
- protocol=mmst
- input=none
-diff --git a/kio/misc/mmsu.protocol b/kio/misc/mmsu.protocol
-index deda935..1c1a7f6 100644
---- a/kio/misc/mmsu.protocol
-+++ b/kio/misc/mmsu.protocol
-@@ -1,5 +1,5 @@
- [Protocol]
--defaultMimetype=uri/mmsu
-+defaultMimetype=x-scheme-handler/mmsu
- exec=
- protocol=mmsu
- input=none
-diff --git a/kio/misc/pnm.protocol b/kio/misc/pnm.protocol
-index 3ca3a7d..fe44c37 100644
---- a/kio/misc/pnm.protocol
-+++ b/kio/misc/pnm.protocol
-@@ -1,5 +1,5 @@
- [Protocol]
--defaultMimetype=uri/pnm
-+defaultMimetype=x-scheme-handler/pnm
- exec=
- protocol=pnm
- input=none
-diff --git a/kio/misc/rtspt.protocol b/kio/misc/rtspt.protocol
-index 9e4fe96..4d86282 100644
---- a/kio/misc/rtspt.protocol
-+++ b/kio/misc/rtspt.protocol
-@@ -1,5 +1,5 @@
- [Protocol]
--defaultMimetype=uri/rtspt
-+defaultMimetype=x-scheme-handler/rtspt
- exec=
- protocol=rtspt
- input=none
-diff --git a/kio/misc/rtspu.protocol b/kio/misc/rtspu.protocol
-index 9cc9299..5fc9d6b 100644
---- a/kio/misc/rtspu.protocol
-+++ b/kio/misc/rtspu.protocol
-@@ -1,5 +1,5 @@
- [Protocol]
--defaultMimetype=uri/rtspu
-+defaultMimetype=x-scheme-handler/rtspu
- exec=
- protocol=rtspu
- input=none
-diff --git a/mimetypes/kde.xml b/mimetypes/kde.xml
-index 2810b5b..8de16f6 100644
---- a/mimetypes/kde.xml
-+++ b/mimetypes/kde.xml
-@@ -187,24 +187,30 @@ Notes:
-     <comment>all files</comment>
-   </mime-type>
- 
--  <!-- uri/ fake mime types -->
--  <mime-type type="uri/mms">
-+  <!-- x-scheme-handler/ fake(ish) mime types -->
-+  <mime-type type="x-scheme-handler/mms">
-     <comment>mms: URIs</comment>
-+    <alias type="uri/mms"/>
-   </mime-type>
--  <mime-type type="uri/mmst">
-+  <mime-type type="x-scheme-handler/mmst">
-     <comment>mmst: URIs</comment>
-+    <alias type="uri/mmst"/>
-   </mime-type>
--  <mime-type type="uri/mmsu">
-+  <mime-type type="x-scheme-handler/mmsu">
-     <comment>mmsu: URIs</comment>
-+    <alias type="uri/mmsu"/>
-   </mime-type>
--  <mime-type type="uri/pnm">
-+  <mime-type type="x-scheme-handler/pnm">
-     <comment>pnm: URIs</comment>
-+    <alias type="uri/pnm"/>
-   </mime-type>
--  <mime-type type="uri/rtspt">
-+  <mime-type type="x-scheme-handler/rtspt">
-     <comment>rtspt: URIs</comment>
-+    <alias type="uri/rtspt"/>
-   </mime-type>
--  <mime-type type="uri/rtspu">
-+  <mime-type type="x-scheme-handler/rtspu">
-     <comment>rtspu: URIs</comment>
-+    <alias type="uri/rtspu"/>
-   </mime-type>
- 
-   <mime-type type="application/vnd.kde.fontspackage">

kdelibs.spec

@@ -16,7 +16,7 @@
 
 Summary: KDE Libraries
 Version: 4.6.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -68,7 +68,8 @@ Patch9: kdelibs-4.5.80-branding.patch
 # don't cache kdeglobals paths because they change after profile directories
 # are loaded from kde4rc
 Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
-# COMMENT ME PLEASE 
+# adds the Administration menu from redhat-menus which equals System + Settings
+# This prevents the stuff getting listed twice, under both System and Settings.
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
 Patch14: kdelibs-4.5.80-libexecdir.patch
@@ -89,9 +90,6 @@ Patch27: kdelibs-4.5.80-no_rpath.patch
 # reverting to our past gnupg2-only setup.
 # TODO: try to use either gpg or gpg2, whichever is available
 Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
-# https://bugs.kde.org/show_bug.cgi?id=269045
-# https://git.reviewboard.kde.org/r/101231/
-Patch51: kdelibs-4.6.2-uri_mimetypes.patch
 
 ## upstream
 # https://projects.kde.org/projects/kde/kdelibs/repository/revisions/72cbad117d0abb4b47a5d00754ea465eda6c06b5
@@ -122,6 +120,7 @@ BuildRequires: qt4-devel >= %{qt4_ver}
 BuildRequires: qt4-webkit-devel
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 Requires: xdg-utils
+Requires: redhat-menus
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -278,7 +277,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 
 # upstreamable patches
 %patch50 -p1 -b .knewstuff_gpg2
-%patch51 -p1 -b .uri_mimetypes
 
 # upstream patches
 %patch100 -p1 -b .kde270538
@@ -537,6 +535,14 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 10 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.2-5
+- Apply the xdg-menu patch everywhere again (#703531)
+- Requires: redhat-menus (proper fix for #701693)
+
+* Tue May 03 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.6.2-4
+- Drop xdg-menu patch on F15+ (#701693)
+- Omit mimetypes patch for now pending upstream feedback
+
 * Mon Apr 25 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.2-3
 - Adjust uri/ mimetypes to use newer x-scheme-handler/ (#587573)