rpms/kpackagekit/devel kpackagekit.spec,1.51,1.52

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kpackagekit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2633

Modified Files:
	kpackagekit.spec 
Log Message:
* Thu Jan 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.6.0-0.2.20100111
- File conflict between kpackagekit and gnome-packagekit (#555139)



Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- kpackagekit.spec	11 Jan 2010 19:08:21 -0000	1.51
+++ kpackagekit.spec	14 Jan 2010 14:04:56 -0000	1.52
@@ -5,7 +5,7 @@
 
 Name:	  	kpackagekit
 Version:	0.6.0
-Release:	0.1.%{snap}%{?dist}
+Release:	0.2.%{snap}%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -55,6 +55,10 @@ make install/fast DESTDIR=${RPM_BUILD_RO
 touch kpackagekit.lang
 %find_lang kpackagekit || echo "NOTICE: translations missing!"
 
+# hack around gnome-packagekit conflict
+mv $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \
+   $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service
+
 
 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kpackagekit.desktop
@@ -76,10 +80,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/kpackagekit/
 %{_kde4_appsdir}/KPackageKitSmartIcon/
 %{_datadir}/dbus-1/services/org.kde.KPackageKitSmartIcon.service
-%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
+%{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service
 
 
 %changelog
+* Thu Jan 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.6.0-0.2.20100111
+- File conflict between kpackagekit and gnome-packagekit (#555139)
+
 * Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.6.0-0.1.20100111
 - kpk-0.6.0 2001-01-11 snapshot