rpms/kpackagekit/F-11 kpackagekit.spec, 1.32, 1.33 kpackagekit-0.4.0-i18n.patch, 1.1, NONE kpackagekit-0.4.0-knotify_persistent.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kpackagekit/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7449/F-11

Modified Files:
	kpackagekit.spec 
Removed Files:
	kpackagekit-0.4.0-i18n.patch 
	kpackagekit-0.4.0-knotify_persistent.patch 
Log Message:
* Fri Jun 05 2009 Rex Dieter <rdieter at fedoraproject.org> 0.4.1-1
- min pk_version 0.4.7
- touchup %files
- highlight missing translations during build (but make it non-fatal)
- drop upstreamed patches



Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/F-11/kpackagekit.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- kpackagekit.spec	5 Jun 2009 17:21:59 -0000	1.32
+++ kpackagekit.spec	5 Jun 2009 18:05:29 -0000	1.33
@@ -1,6 +1,9 @@
+
+%define pk_version 0.4.7
+
 Name:	  	kpackagekit
 Version:	0.4.1
-Release:	0%{?dist}
+Release:	1%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
@@ -11,26 +14,27 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 
 # upstream me, says the patch
 Patch100: kpackagekit-InitialPreference.patch
-#Patch101: kpackagekit-0.4.0-knotify_persistent.patch
-#Patch102: kpackagekit-0.4.1-i18n.patch
+Patch102: kpackagekit-0.4.1-i18n.patch
 
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:	kde-filesystem
 BuildRequires:	kdelibs4-devel
-BuildRequires:	PackageKit-qt-devel >= 0.4.2
+BuildRequires:	PackageKit-qt-devel >= %{pk_version} 
 BuildRequires:  gettext
 BuildRequires:  dbus-qt-devel
 
+Requires: PackageKit-qt >= %{pk_version}
+
 %description
 KDE interface for PackageKit.
 
+
 %prep
 %setup -q -n KPackageKit
 
 %patch100 -p0 -b .InitialPreference
-#patch101 -p1 -b .knotify_persistent
-#patch102 -p1 -b .i18n
+%patch102 -p1 -b .i18n
 
 
 %build
@@ -47,34 +51,39 @@ rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=${RPM_BUILD_ROOT} -C %{_target_platform}
 
-desktop-file-install \
-  --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
-  --vendor="" \
-  --remove-category="SoftwareManagement" \
-  --add-category="X-SoftwareManagement" \
-  $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kpackagekit.desktop
+touch kpackagekit.lang
+%find_lang kpackagekit || echo "NOTICE: translations missing!"
+
+
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kpackagekit.desktop
 
-#find_lang kpackagekit
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#files -f kpackagekit.lang
-%files
+
+%files -f kpackagekit.lang
 %defattr(-,root,root,-)
-%{_libdir}/libkpackagekitlib.so
-%{_bindir}/kpackagekit
-/usr/libexec/kde4/kpackagekitsmarticon
+%{_kde4_bindir}/kpackagekit
+%{_kde4_libdir}/libkpackagekitlib.so
 %{_kde4_libdir}/kde4/*.so
+%{_kde4_libexecdir}/kpackagekitsmarticon
 %{_kde4_datadir}/applications/kde4/kpackagekit.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
 %{_kde4_datadir}/kde4/services/kded/*.desktop
-%{_kde4_appsdir}/kpackagekit/*
-%{_kde4_appsdir}/KPackageKitSmartIcon/KPackageKitSmartIcon.notifyrc
+%{_kde4_appsdir}/kpackagekit/
+%{_kde4_appsdir}/KPackageKitSmartIcon/
 %{_datadir}/dbus-1/services/org.kde.KPackageKitSmartIcon.service
 
 
 %changelog
+* Fri Jun 05 2009 Rex Dieter <rdieter at fedoraproject.org> 0.4.1-1
+- min pk_version 0.4.7
+- touchup %%files
+- highlight missing translations during build (but make it non-fatal)
+- drop upstreamed patches
+
 * Fri Jun 05 2009 Steven M. Parrish <tuxbrewr at fedoraproject.org> - 0.4.1-0
 - New upstream release.  Fixes compatibility with Packagekit 0.4.8 (#503989)
 


--- kpackagekit-0.4.0-i18n.patch DELETED ---


--- kpackagekit-0.4.0-knotify_persistent.patch DELETED ---