Merge branch 'master' into f16

Conflicts:
	kdelibs.spec

kdelibs.spec

@@ -19,11 +19,11 @@
 %global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
 
 ## exclude libkactivities or not
-#define no_libkactivities 1
+%define no_libkactivities 1
 
 Summary: KDE Libraries
-Version: 4.7.2
-Release: 5%{?dist}
+Version: 4.7.3
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -125,8 +125,6 @@ Patch50: kdelibs-4.7.0-knewstuff2_gpg2.patch
 Patch51: kdelibs-4.6.2-uri_mimetypes.patch
 
 ## upstream
-# fix nepomuk queries *not* using wide-unicode
-Patch100: kdelibs-4.7.2-nepomuk_unicode.patch
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -321,7 +319,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch51 -p1 -b .uri_mimetypes
 
 # upstream patches
-%patch100 -p1 -b .nepomuk_unicode
 
 # security fixes
 %patch200 -p1 -b .CVE-2009-2702
@@ -574,6 +571,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Nov 04 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.3-2
+- no_libkactivities
+
+* Sat Oct 29 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.3-1
+- 4.7.3
+
 * Thu Oct 27 2011 Rex Dieter <rdieter@fedoraproject.org> 4.7.2-5
 - omit knotify hack, fix in qt instead