[kpackagekit] - 0.6.3 snapshot (sans translations)

[Rex Dieter]

commit 64dbc168f2c39458b2104c9eae7860c9b915d184
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Dec 14 12:31:37 2010 -0600

    - 0.6.3 snapshot (sans translations)

 .gitignore                       |    1 +
 kpackagekit-defaults_hacks.patch |  132 --------------------------------------
 kpackagekit.spec                 |   55 +++++++++-------
 kpackagekit_snapshot.sh          |   17 +++++
 sources                          |    2 +-
 5 files changed, 49 insertions(+), 158 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b86226..e2e0ecc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 kpackagekit-0.6.0.tar.gz
 /kpackagekit-0.6.1.tar.bz2
 /kpackagekit-0.6.2.tar.bz2
+/kpackagekit-0.6.3-20101214.tar.bz2
diff --git a/kpackagekit.spec b/kpackagekit.spec
index affe199..0bf6b57 100644
--- a/kpackagekit.spec
+++ b/kpackagekit.spec
@@ -1,32 +1,25 @@
-%define pk_min_version 0.6.2
+%define pk_min_version 0.6.11
 
-%define snap 20100827
+%define snap 20101214
+
+## include app-install support and/or for testing/customizing categories.xml
+#define app_install 1
 
 Name:	  	kpackagekit
-Version:	0.6.2
-Release:	1%{?dist}
+Version:	0.6.3
+Release:	0.1.%{snap}%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
 Group:		Applications/System
-Source0:	kpackagekit-%{version}.tar.bz2
-# Use this config for the create_tarball.rb script:
-# [kpackagekit]
-# mainmodule   = playground
-# submodule    = sysadmin
-# kde_release  = no
-# version      = 20100301svn
-# docs         = no
-# translations = yes
-#Source0:	kpackagekit-0.6.1-%{snap}.tar.bz2
+Source0:	kpackagekit-%{version}-%{snap}.tar.bz2
+Source1:	kpackagekit_snapshot.sh
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
 # add support for automatic printer driver installation (Tim Waugh, #576615)
-Patch0:		kpackagekit-0.6.1-InstallPrinterDrivers.patch
-
-#Hacks to smash kpackagekit: daily/none default (#469375)
-Patch50:	 kpackagekit-defaults_hacks.patch
+Patch50: kpackagekit-0.6.1-InstallPrinterDrivers.patch
 
 # required because gnome-packagekit provides exactly the same interface
 Provides: PackageKit-session-service
@@ -38,10 +31,10 @@ BuildRequires:	kde-filesystem
 BuildRequires:	kdelibs4-devel
 BuildRequires:	PackageKit-qt-devel >= %{pk_min_version} 
 
+%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
+%{?_kde4_version:Requires: kdebase-workspace >= %{_kde4_version}}
 %global pk_version %(pkg-config --modversion packagekit-qt 2> /dev/null || echo %{pk_min_version})
 Requires: PackageKit-qt >= %{pk_version}
-# or do kdebase-runtime instead? -- Rex
-%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
 
 %description
 KDE interface for PackageKit.
@@ -51,13 +44,15 @@ KDE interface for PackageKit.
 
 %setup -q -n kpackagekit-%{version}
 
-%patch0 -p1 -b .InstallPrinterDrivers
-%patch50  -p1 -b .defaults_hacks
+%patch50 -p1 -b .InstallPrinterDrivers
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} ..  
+%{cmake_kde4} \
+  %{?app_install:-DAPPINSTALL=ON} \
+  ..  
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -68,7 +63,8 @@ rm -rf $RPM_BUILD_ROOT
 
 make install/fast DESTDIR=${RPM_BUILD_ROOT} -C %{_target_platform}
 
-%find_lang kpackagekit
+## FIXME, current snapshots have no translations
+%{?!snap:%find_lang kpackagekit}
 
 # hack around gnome-packagekit conflict
 mv $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service \
@@ -83,7 +79,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kpackage
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -f kpackagekit.lang
+%files %{?!snap: -f kpackagekit.lang}
 %defattr(-,root,root,-)
 %{_kde4_bindir}/kpackagekit
 %{_kde4_libdir}/libkpackagekitlib.so
@@ -96,9 +92,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_kde4_appsdir}/KPackageKitSmartIcon/
 %{_datadir}/dbus-1/services/org.kde.KPackageKitSmartIcon.service
 %{_datadir}/dbus-1/services/kde-org.freedesktop.PackageKit.service
+%if 0%{?app_install}
+# own this until app-install or something better comes along -- Rex
+%dir %{_datadir}/app-install
+# TODO: fix this to match comps' categories/groups
+%{_datadir}/app-install/categories.xml
+%endif
 
 
 %changelog
+* Tue Dec 14 2010 Rex Dieter <rdieter at fedoraproject.org> 0.6.3-0.1.20101214
+- 0.6.3 snapshot (sans translations)
+
 * Tue Oct 12 2010 Steven M. Parrish <smparrish at gmail.com> 0.6.2-1
 - New upstream release
 
diff --git a/kpackagekit_snapshot.sh b/kpackagekit_snapshot.sh
new file mode 100755
index 0000000..e8c58c3
--- /dev/null
+++ b/kpackagekit_snapshot.sh
@@ -0,0 +1,17 @@
+#/bin/sh
+
+DATE=$(date +%Y%m%d)
+EXPORT_DIR=kpackagekit
+VERSION=0.6.3
+
+set -x
+rm -rf $EXPORT_DIR
+
+git clone git://git.kde.org/apper ${EXPORT_DIR}
+pushd $EXPORT_DIR 
+git archive --prefix=kpackagekit-${VERSION}/ master | bzip2 > ../kpackagekit-${VERSION}-${DATE}.tar.bz2
+popd
+
+# cleanup
+rm -rf $EXPORT_DIR
+
diff --git a/sources b/sources
index 5a4620d..0f73062 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ef4c2b08c63918cff331381ff445ab4  kpackagekit-0.6.2.tar.bz2
+0c25aa7b96905e5a1cda31e66b4b0ef7  kpackagekit-0.6.3-20101214.tar.bz2