From fe9f61f18f5718e1489cea631406798146e87193 Mon Sep 17 00:00:00 2001
From: Richard Hughes <rhughes@fedoraproject.org>
Date: Mar 15 2010 14:22:32 +0000
Subject: - New upstream release of 0.6.2.

- Update to the latest version of the Fedora Packaging Guidelines
- Do not Require: pkgconfig
- Fix up a few file ownership issues
- Remove the custom BuildRoot
- Do not clean the buildroot before install

---

diff --git a/.cvsignore b/.cvsignore
index ec2f632..1382654 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-PackageKit-0.6.2-20100225.tar.bz2
+PackageKit-0.6.2.tar.bz2
diff --git a/PackageKit.spec b/PackageKit.spec
index a918caa..624dcec 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -1,23 +1,22 @@
-%define glib2_version			2.16.1
-%define dbus_version			1.1.1
-%define dbus_glib_version		0.74
-%define polkit_version			0.92
-%define libnm_glib_version		0.6.5
-%define alphatag			20100225
+%define glib2_version                   2.16.1
+%define dbus_version                    1.1.1
+%define dbus_glib_version               0.74
+%define polkit_version                  0.92
+%define libnm_glib_version              0.6.5
+%define alphatag                        20100219
 
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Summary:   Package management service
 Name:      PackageKit
 Version:   0.6.2
-Release:   0.1.%{?alphatag}git%{?dist}
-#Release:   1%{?dist}
+#Release:   0.1.%{?alphatag}git%{?dist}
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
 URL:       http://www.packagekit.org
-Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.bz2
-#Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Source0:   http://www.packagekit.org/releases/%{name}-%{version}-%{?alphatag}.tar.bz2
+Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.bz2
 
 # Fedora-specific: set Vendor.conf up for Fedora.
 Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
@@ -161,7 +160,6 @@ Summary: GLib Libraries and headers for PackageKit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-devel >= %{dbus_version}
-Requires: pkgconfig
 Requires: sqlite-devel
 Requires: PackageKit-glib = %{version}-%{release}
 Obsoletes: PackageKit-devel < %{version}-%{release}
@@ -174,7 +172,6 @@ GLib headers and libraries for PackageKit.
 Summary: Qt Libraries and headers for PackageKit
 Group: Development/Libraries
 Requires: %{name}-qt = %{version}-%{release}
-Requires: pkgconfig
 
 %description qt-devel
 Qt headers and libraries for PackageKit.
@@ -242,29 +239,28 @@ after firmware has been installed by PackageKit. This removes the need for the
 user to restart the computer or remove and re-insert the device.
 
 %prep
-%setup -q -n %{?name}-%{?version}-%{?alphatag}
-#%setup -q
+#%setup -q -n %{?name}-%{?version}-%{?alphatag}
+%setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
 
 %build
 %configure \
-	--disable-static \
-	--enable-yum \
+        --disable-static \
+        --enable-yum \
 %if 0%{?rhel} == 0
-	--enable-smart \
-	--enable-introspection \
+        --enable-smart \
+        --enable-introspection \
 %endif
-	--with-default-backend=yum \
-	--disable-local \
-	--disable-ruck \
-	--disable-strict \
-	--disable-tests
+        --with-default-backend=yum \
+        --disable-local \
+        --disable-ruck \
+        --disable-strict \
+        --disable-tests
 
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit*.la
@@ -320,7 +316,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %dir %{_sysconfdir}/bash_completion.d
 %dir %{_libdir}/packagekit-backend
 %config %{_sysconfdir}/bash_completion.d/pk-completion.bash
-%config(noreplace) %{_sysconfdir}/PackageKit/*.conf
+%config(noreplace) %{_sysconfdir}/PackageKit/PackageKit.conf
+%config(noreplace) %{_sysconfdir}/PackageKit/Vendor.conf
 %config %{_sysconfdir}/dbus-1/system.d/*
 %dir %{_datadir}/PackageKit/helpers/test_spawn
 %dir %{_datadir}/PackageKit/icons
@@ -368,6 +365,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %files yum
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
+#%config(noreplace) %{_sysconfdir}/PackageKit/Yum.conf
 %{_libdir}/packagekit-backend/libpk_backend_yum.so
 %dir %{_datadir}/PackageKit/helpers/yum
 %{_datadir}/PackageKit/helpers/yum/*
@@ -423,6 +421,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %doc README AUTHORS NEWS COPYING
 %{_sysconfdir}/profile.d/*
 %{_libexecdir}/pk-command-not-found
+%config(noreplace) %{_sysconfdir}/PackageKit/CommandNotFound.conf
 
 %files device-rebind
 %defattr(-,root,root,-)
@@ -458,7 +457,15 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_includedir}/PackageKit/backend/*.h
 
 %changelog
-* Tue Feb 25 2010 Richard Hughes  <rhughes@redhat.com> - 0.6.2-0.1.20100225git
+* Mon Mar 15 2010 Richard Hughes <rhughes@redhat.com> - 0.6.2-1
+- New upstream release of 0.6.2.
+- Update to the latest version of the Fedora Packaging Guidelines
+- Do not Require: pkgconfig
+- Fix up a few file ownership issues
+- Remove the custom BuildRoot
+- Do not clean the buildroot before install
+
+* Tue Feb 25 2010 Richard Hughes <rhughes@redhat.com> - 0.6.2-0.1.20100225git
 - Add a pre-release snapshot to include all of the most recent fixes for the
   F13 alpha release.
 - Resolves: #568193
diff --git a/sources b/sources
index ea33b60..c7de706 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eda9f97da23b137fea153ce910518556  PackageKit-0.6.2-20100225.tar.bz2
+c5a07b023054882750bb273381000194  PackageKit-0.6.2.tar.bz2