From 0470159840ebbaea3fe7f283940f6260c2d9651a Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 29 Mar 2010 12:13:30 +0000 Subject: [PATCH] - New upstream version - 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 --- .cvsignore | 2 +- PackageKit-0.6.3-disable-zif.patch | 10 +++++ PackageKit.spec | 70 +++++++++++++++++------------- sources | 2 +- 4 files changed, 51 insertions(+), 33 deletions(-) create mode 100644 PackageKit-0.6.3-disable-zif.patch diff --git a/.cvsignore b/.cvsignore index 1382654..4e9248e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PackageKit-0.6.2.tar.bz2 +PackageKit-0.6.3.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 187788c..30fb2f6 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -1,15 +1,11 @@ -%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 +%define dbus_version 1.1.1 +%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 +Version: 0.6.3 #Release: 0.1.%{?alphatag}git%{?dist} Release: 2%{?dist} License: GPLv2+ @@ -17,7 +13,6 @@ 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) # Fedora-specific: set Vendor.conf up for Fedora. Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch @@ -25,28 +20,26 @@ 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 -Requires: dbus >= %{dbus_version} -Requires: dbus-glib >= %{dbus_glib_version} +# Fedora specific: zif is not ready for prime-time just yet +Patch2: PackageKit-0.6.3-disable-zif.patch + Requires: PackageKit-glib = %{version}-%{release} Requires: PackageKit-gtk-module = %{version}-%{release} 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: glib2-devel >= %{glib2_version} +BuildRequires: glib2-devel >= 2.16.1 BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: dbus-glib-devel >= %{dbus_glib_version} +BuildRequires: dbus-glib-devel >= 0.74 BuildRequires: pam-devel BuildRequires: libX11-devel BuildRequires: xmlto BuildRequires: sqlite-devel -BuildRequires: NetworkManager-glib-devel >= %{libnm_glib_version} -BuildRequires: polkit-devel >= %{polkit_version} +BuildRequires: NetworkManager-devel +BuildRequires: polkit-devel >= 0.92 +#BuildRequires: polkit BuildRequires: libtool BuildRequires: docbook-utils BuildRequires: gnome-doc-utils @@ -68,6 +61,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} @@ -162,7 +161,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} @@ -175,7 +173,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. @@ -247,25 +244,25 @@ user to restart the computer or remove and re-insert the device. %setup -q %patch0 -p1 -b .fedora %patch1 -p1 -b .no-time +%patch2 -p1 -b .no-zif %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 @@ -321,7 +318,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 @@ -369,6 +367,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/* @@ -424,6 +423,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,-) @@ -459,6 +459,14 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_includedir}/PackageKit/backend/*.h %changelog +* Mon Mar 29 2010 Richard Hughes - 0.6.3-1 +- New upstream version +- 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 + * Sat Mar 13 2010 Rex Dieter - 0.6.2-2 - -qt: add minimal qt4 runtime dependency diff --git a/sources b/sources index c7de706..a2b3ec6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5a07b023054882750bb273381000194 PackageKit-0.6.2.tar.bz2 +b6eb8f09d319a02158a1bcac25468a63 PackageKit-0.6.3.tar.bz2