From 255d8d7eaa2c5251ad7c59908debcaec093217e0 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mar 23 2010 10:51:23 +0000 Subject: - Add a pre-release snapshot to include all of the most recent fixes for the F13 beta release. - Remove preupgrade hard depends as it's not installed by default for gnome-desktop in comps. --- diff --git a/.cvsignore b/.cvsignore index 1382654..081b9d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PackageKit-0.6.2.tar.bz2 +PackageKit-0.6.3-20100322.tar.bz2 diff --git a/PackageKit-0.6.3-disable-zif.patch b/PackageKit-0.6.3-disable-zif.patch new file mode 100644 index 0000000..7083b18 --- /dev/null +++ b/PackageKit-0.6.3-disable-zif.patch @@ -0,0 +1,10 @@ +diff -urNp PackageKit-0.6.3-20100322.old/backends/yum/Yum.conf PackageKit-0.6.3-20100322/backends/yum/Yum.conf +--- PackageKit-0.6.3-20100322.old/backends/yum/Yum.conf 2010-03-22 15:37:23.000000000 +0000 ++++ PackageKit-0.6.3-20100322/backends/yum/Yum.conf 2010-03-22 15:37:43.000000000 +0000 +@@ -22,5 +22,5 @@ DisabledPlugins=rpm-warm-cache;remove-wi + # benchmark tests. + # + # default=true +-UseZif=true ++UseZif=false + diff --git a/PackageKit.spec b/PackageKit.spec index 2f4d2ca..a7d24dd 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -3,20 +3,20 @@ %define dbus_glib_version 0.74 %define polkit_version 0.92 %define libnm_glib_version 0.6.5 -%define alphatag 20100219 +%define alphatag 20100322 %{!?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: 2%{?dist} +Version: 0.6.3 +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 +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 @@ -24,6 +24,9 @@ Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch # Fedora specific: the yum backend doesn't do time estimation correctly Patch1: PackageKit-0.4.4-Fedora-turn-off-time.conf.patch +# Fedora specific: zif is not ready for prime-time just yet +Patch2: PackageKit-0.6.3-disable-zif.patch + Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: PackageKit-glib = %{version}-%{release} @@ -32,11 +35,8 @@ Requires: PackageKit-yum-plugin = %{version}-%{release} Requires: PackageKit-yum = %{version}-%{release} Requires: shared-mime-info Requires: comps-extras -%if 0%{?rhel} == 0 -Requires: preupgrade -%endif -BuildRequires: polkit >= %{polkit_version} +BuildRequires: polkit >= %{polkit_version} BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -44,7 +44,7 @@ BuildRequires: pam-devel BuildRequires: libX11-devel BuildRequires: xmlto BuildRequires: sqlite-devel -BuildRequires: NetworkManager-glib-devel >= %{libnm_glib_version} +BuildRequires: NetworkManager-devel >= %{libnm_glib_version} BuildRequires: polkit-devel >= %{polkit_version} BuildRequires: libtool BuildRequires: docbook-utils @@ -67,6 +67,12 @@ BuildRequires: gobject-introspection-devel #BuildRequires: gtk-sharp2-devel #BuildRequires: mono-core +# for the fancy new yum accelerator, which we don't actually use yet... +BuildRequires: rpm-devel +BuildRequires: libsoup-devel +BuildRequires: bzip2-devel +BuildRequires: zlib-devel + # functionality moved to udev itself Obsoletes: PackageKit-udev-helper < %{version}-%{release} Obsoletes: udev-packagekit < %{version}-%{release} @@ -240,10 +246,11 @@ 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 +%patch2 -p1 -b .no-zif %build %configure \ @@ -366,7 +373,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files yum %defattr(-,root,root,-) %doc README AUTHORS NEWS COPYING -#%config(noreplace) %{_sysconfdir}/PackageKit/Yum.conf +%config(noreplace) %{_sysconfdir}/PackageKit/Yum.conf %{_libdir}/packagekit-backend/libpk_backend_yum.so %dir %{_datadir}/PackageKit/helpers/yum %{_datadir}/PackageKit/helpers/yum/* @@ -458,6 +465,12 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_includedir}/PackageKit/backend/*.h %changelog +* Tue Mar 23 2010 Richard Hughes - 0.6.3-0.1.20100322git +- Add a pre-release snapshot to include all of the most recent fixes for the + F13 beta release. +- Remove preupgrade hard depends as it's not installed by default for + gnome-desktop in comps. + * Mon Mar 22 2010 Rex Dieter - 0.6.2-2 - -qt: add minimal qt4 runtime dependency (#573308) diff --git a/sources b/sources index c7de706..933fecf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5a07b023054882750bb273381000194 PackageKit-0.6.2.tar.bz2 +3a199ed570969c30e6e5ea5ffdad63ad PackageKit-0.6.3-20100322.tar.bz2