Merge branch 'f17' into f16

Conflicts:
	apper.spec

apper-conserve-resources.patch

@@ -0,0 +1,21 @@
+commit cf0bdce8bac567a4b56a9af787e2dc65bb3faf5c
+Author: Daniel Nicoletti <dantt12@gmail.com>
+Date:   Tue Jun 19 13:43:51 2012 -0300
+
+    Libsolid now reports the right valeu when it should conserve resources
+
+diff --git a/apperd/ApperdThread.cpp b/apperd/ApperdThread.cpp
+index d10a3f4..cd99343 100644
+--- a/apperd/ApperdThread.cpp
++++ b/apperd/ApperdThread.cpp
+@@ -303,8 +303,8 @@ bool ApperdThread::isSystemReady(bool ignoreBattery, bool ignoreMobile) const
+     // check how applications should behave (e.g. on battery power)
+     if (!ignoreBattery && Solid::PowerManagement::appShouldConserveResources()) {
+         kDebug() << "System is not ready, application should conserve resources";
+-        // FIXME this always return true even on AC
+-//        return false;
++        // This was fixed for KDElibs 4.8.5
++        return false;
+     }
+ 
+     // TODO it would be nice is Solid provided this

apper.spec

@@ -5,7 +5,7 @@
 
 Name:    apper
 Version: 0.7.2
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: KDE interface for PackageKit
 
 License: GPLv2+
@@ -20,6 +20,7 @@ URL:     http://kde-apps.org/content/show.php/Apper?content=84745
 ## upstreamable patches
 
 ## upstream patches
+Patch0:    apper-conserve-resources.patch
 
 Obsoletes: kpackagekit < 0.7.0
 Provides:  kpackagekit = %{version}-%{release}
@@ -45,6 +46,7 @@ KDE interface for PackageKit.
 
 %prep
 %setup -q 
+%patch0 -p1 -b .conserve-resources
 
 
 %build
@@ -77,6 +79,14 @@ chrpath --replace %{_kde4_libdir}/apper %{buildroot}%{_kde4_bindir}/apper
 desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.desktop
 
 
+%posttrans
+update-desktop-database -q 2> /dev/null ||:
+
+%postun
+if [ $1 -eq 0 ] ; then
+update-desktop-database -q 2> /dev/null ||:
+fi
+
 %files -f apper.lang
 %doc COPYING TODO
 %{_kde4_bindir}/apper
@@ -102,6 +112,12 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/apper.deskt
 
 
 %changelog
+* Fri Sep 07 2012 Rex Dieter <rdieter@fedoraproject.org> 0.7.2-4
+- add scriptlet to register mimetypes (#836559)
+
+* Fri Jul 20 2012 Lukas Tinkl <ltinkl@redhat.com> 0.7.2-3
+- re-apply patch to not check for updates when on battery
+
 * Thu Jun 28 2012 Rex Dieter <rdieter@fedoraproject.org> 0.7.2-2
 - rebuild (PackageKit)