rpms/kpackagekit/devel kpackagekit-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 kpackagekit.spec, 1.13, 1.14 sources, 1.5, 1.6 FindQPackageKit.cmake, 1.1, NONE kpackagekit-0.3.1-cmake_module_path.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore kpackagekit.spec sources 
Added Files:
	kpackagekit-svn_checkout.sh 
Removed Files:
	FindQPackageKit.cmake 
	kpackagekit-0.3.1-cmake_module_path.patch 
Log Message:
import/update, but don't build... yet.

* Wed Nov 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.3.1-7.20081126svn
- 20081126svn (trunk/playground) snapshot (keep old bits, just in case)



--- NEW FILE kpackagekit-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=kpackagekit

set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/trunk/playground/sysadmin/kpackagekit $EXPORT_DIR/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Oct 2008 20:37:41 -0000	1.5
+++ .cvsignore	26 Nov 2008 20:16:14 -0000	1.6
@@ -1 +1,2 @@
 84745-kpackagekit-0.3.1.tar.bz2
+kpackagekit-20081126svn.tar.bz2


Index: kpackagekit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/kpackagekit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kpackagekit.spec	26 Nov 2008 17:27:33 -0000	1.13
+++ kpackagekit.spec	26 Nov 2008 20:16:15 -0000	1.14
@@ -1,26 +1,27 @@
-%define betaversion b4
+#define betaversion b4
+%define svn 20081126svn
 
 Name:	  	kpackagekit
 Version:	0.3.1
-Release:	6%{?dist}
+Release:	7.%{svn}%{?dist}
 Summary:	KDE interface for PackageKit
 
 License:	GPLv2+
 Group:		Applications/System
+%if 0%{?svn:1}
+Source0:        kpackagekit-%{svn}.tar.bz2
+Source1:        kpackagekit-svn_checkout.sh
+%else
 Source0: 	http://www.kde-apps.org/CONTENT/content-files/84745-kpackagekit-%{version}.tar.bz2
+Patch1:         kpackagekit-0.3.1-kdeinit.patch
+Patch3:         kpackagekit-0.3.1-pk_api.patch
+%endif
 URL:		http://www.kde-apps.org/content/show.php/KPackageKit?content=84745
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# http://websvn.kde.org/*checkout*/trunk/playground/sysadmin/kpackagekit/cmake/modules/FindQPackageKit.cmake
-Source1: FindQPackageKit.cmake
-
-Patch1: kpackagekit-0.3.1-kdeinit.patch
-Patch2: kpackagekit-0.3.1-cmake_module_path.patch
-Patch3: kpackagekit-0.3.1-pk_api.patch
-
 BuildRequires:	cmake
 BuildRequires:  desktop-file-utils
-BuildRequires:	kde-filesystem
+BuildRequires:  kde-filesystem
 BuildRequires:	kdelibs4-devel
 BuildRequires:	PackageKit-qt-devel >= 0.3.11
 
@@ -28,27 +29,28 @@
 KDE interface for PackageKit.
 
 %prep
-%setup -q -n KPackageKit 
-
+%if 0%{?svn:1}
+%setup -q -n kpackagekit
+%else
+%setup -q -n KPackageKit
 %patch1 -p1 -b .kdeinit
-
-#install -p -D %{SOURCE1} cmake/modules/FindQPackageKit.cmake
-#patch2 -p1 -b .cmake_module_path
-
 %patch3 -p1 -b .pk_api
+%endif
 
 
 %build
-%{cmake_kde4} \
-  -DQPACKAGEKIT_INCLUDE_DIR=%{_includedir}/PackageKit/ \
-  .
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 
-make %{?_smp_mflags} VERBOSE=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=${RPM_BUILD_ROOT}
+make install/fast DESTDIR=${RPM_BUILD_ROOT} -C %{_target_platform}
 
 desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
@@ -61,10 +63,20 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%if 0%{?svn:1}
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+%endif
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/kpackagekit
 %{_bindir}/kpackagekit-smart-icon
+# FIXME?, unversioned soname -- Rex
+%{?svn:%{_kde4_libdir}/libkpackagekitlib.so}
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_datadir}/applications/kde4/kpackagekit.desktop
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -74,8 +86,12 @@
 
 
 %changelog
+* Wed Nov 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.3.1-7.20081126svn
+- 20081126svn (trunk/playground) snapshot (keep old bits, just in case)
+
 * Wed Nov 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.3.1-6
 - respin (PackageKit)
+- spec cleanup
 
 * Sat Nov 01 2008 Rex Dieter <rdieter at fedoraproject.org> 0.3.1-5
 - use PackageKit's FindQPackageKit.cmake


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Oct 2008 20:37:41 -0000	1.5
+++ sources	26 Nov 2008 20:16:15 -0000	1.6
@@ -1 +1,2 @@
 eb4db65cf2b252dc39eb844ccc174a4d  84745-kpackagekit-0.3.1.tar.bz2
+b1f6e9c733c8283f47d002fffe4298a2  kpackagekit-20081126svn.tar.bz2


--- FindQPackageKit.cmake DELETED ---


--- kpackagekit-0.3.1-cmake_module_path.patch DELETED ---