rpms/kpackagekit/devel .cvsignore, 1.6, 1.7 kpackagekit.spec, 1.14, 1.15 sources, 1.6, 1.7 kpackagekit-svn_checkout.sh, 1.1, NONE

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	.cvsignore kpackagekit.spec sources 
Removed Files:
	kpackagekit-svn_checkout.sh 
Log Message:
Sync the F10 stuff so we can fix the broken dep quickly.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Nov 2008 20:16:14 -0000	1.6
+++ .cvsignore	27 Nov 2008 21:54:08 -0000	1.7
@@ -1,2 +1 @@
 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kpackagekit.spec	26 Nov 2008 20:16:15 -0000	1.14
+++ kpackagekit.spec	27 Nov 2008 21:54:08 -0000	1.15
@@ -1,27 +1,22 @@
-#define betaversion b4
-%define svn 20081126svn
+%define betaversion b4
 
 Name:	  	kpackagekit
 Version:	0.3.1
-Release:	7.%{svn}%{?dist}
+Release:	6%{?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)
 
+Patch1: kpackagekit-0.3.1-kdeinit.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
 
@@ -29,13 +24,10 @@
 KDE interface for PackageKit.
 
 %prep
-%if 0%{?svn:1}
-%setup -q -n kpackagekit
-%else
-%setup -q -n KPackageKit
+%setup -q -n KPackageKit 
+
 %patch1 -p1 -b .kdeinit
 %patch3 -p1 -b .pk_api
-%endif
 
 
 %build
@@ -63,20 +55,10 @@
 %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
@@ -86,9 +68,6 @@
 
 
 %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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kpackagekit/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Nov 2008 20:16:15 -0000	1.6
+++ sources	27 Nov 2008 21:54:08 -0000	1.7
@@ -1,2 +1 @@
 eb4db65cf2b252dc39eb844ccc174a4d  84745-kpackagekit-0.3.1.tar.bz2
-b1f6e9c733c8283f47d002fffe4298a2  kpackagekit-20081126svn.tar.bz2


--- kpackagekit-svn_checkout.sh DELETED ---