[PackageKit/f20-gnome-3-12] New upstream release

Richard Hughes rhughes at fedoraproject.org
Tue Apr 29 15:04:23 UTC 2014


commit b3496b35566aaf88c6a3c0f89b17752030ae3776
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Apr 29 16:03:53 2014 +0100

    New upstream release

 .gitignore                        |    7 ++-
 PackageKit-0.7.4-xulrunner2.patch |   12 ---
 PackageKit.spec                   |  157 +++++++++++++------------------------
 sources                           |    2 +-
 4 files changed, 63 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8af2c2..01a4c99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,9 @@ PackageKit-0.6.7.tar.bz2
 /PackageKit-0.8.14.tar.xz
 /PackageKit-0.8.15.tar.xz
 /PackageKit-0.8.16.tar.xz
-/PackageKit-0.8.17.tar.xz
+/PackageKit-0.9.1-20140130.tar.xz
+/PackageKit-0.9.1-20140217.tar.xz
+/PackageKit-0.9.1-20140226.tar.xz
+/PackageKit-0.9.1-20140307.tar.xz
+/PackageKit-0.9.1.tar.xz
+/PackageKit-0.9.2.tar.xz
diff --git a/PackageKit.spec b/PackageKit.spec
index 8fc5c12..991a542 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -1,30 +1,27 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
+##%define gitdate 20140307
+
 %define _default_patch_fuzz 2
+%global __python %{__python3}
 %{!?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.8.17
+Version:   0.9.2
 Release:   1%{?dist}
 License:   GPLv2+ and LGPLv2+
-URL:       http://www.packagekit.org
-Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
+URL:       http://www.freedesktop.org/software/PackageKit/
+Source0:   http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz
 
 # Fedora-specific: set Vendor.conf up for Fedora.
 Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 
-# Upstreamable?  allow use of xulrunner2 for browser-plugin support
-Patch4: PackageKit-0.7.4-xulrunner2.patch
-
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
-Requires: PackageKit-backend
 Requires: shared-mime-info
 Requires: comps-extras
 Requires: systemd
 
-# required by patch4
-BuildRequires: automake gtk-doc libtool
 BuildRequires: glib2-devel >= 2.32.0
 BuildRequires: dbus-devel  >= 1.1.1
 BuildRequires: dbus-glib-devel >= 0.74
@@ -41,15 +38,15 @@ BuildRequires: gtk2-devel
 BuildRequires: gtk3-devel
 BuildRequires: docbook-utils
 BuildRequires: gnome-doc-utils
-BuildRequires: python-devel
+BuildRequires: python3-devel
 BuildRequires: perl(XML::Parser)
 BuildRequires: intltool
 BuildRequires: gettext
 BuildRequires: libgudev1-devel
 BuildRequires: xulrunner-devel
 BuildRequires: libarchive-devel
-BuildRequires: gstreamer-devel
-BuildRequires: gstreamer-plugins-base-devel
+BuildRequires: gstreamer1-devel
+BuildRequires: gstreamer1-plugins-base-devel
 BuildRequires: pango-devel
 BuildRequires: fontconfig-devel
 BuildRequires: systemd-devel
@@ -72,60 +69,32 @@ Obsoletes: udev-packagekit < %{version}-%{release}
 # No more GTK+-2 plugin
 Obsoletes: PackageKit-gtk-module < %{version}-%{release}
 
-# No more smart in Fedora
+# No more zif, smart or yum in Fedora
 Obsoletes: PackageKit-smart < %{version}-%{release}
+Obsoletes: PackageKit-yum < 0.9.1
+Obsoletes: PackageKit-yum-plugin < 0.9.1
+Obsoletes: PackageKit-zif < 0.8.13-2
+
+# components now built-in
+Obsoletes: PackageKit-debug-install < 0.9.1
+Obsoletes: PackageKit-hawkey < 0.9.1
 
 # Udev no longer provides this functionality
-Provides: PackageKit-device-rebind = %{version}-%{release}
 Obsoletes: PackageKit-device-rebind < 0.8.13-2
 
+# remove F22
+Provides: PackageKit-debug-install = %{version}-%{release}
+Provides: PackageKit-device-rebind = %{version}-%{release}
+Provides: PackageKit-hawkey = %{version}-%{release}
+Provides: PackageKit-yum = %{version}-%{release}
+Provides: PackageKit-yum-plugin = %{version}-%{release}
+Provides: PackageKit-zif = %{version}-%{release}
+
 %description
 PackageKit is a D-Bus abstraction layer that allows the session user
 to manage packages in a secure way using a cross-distro,
 cross-architecture API.
 
-%package yum
-Summary: PackageKit YUM backend
-Requires: yum >= 3.4.3-45
-# python(gio)
-Requires: pygobject2
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Provides: PackageKit-backend
-
-%description yum
-A backend for PackageKit to enable yum functionality.
-
-%if 0%{?rhel} == 0
-%package hawkey
-Summary: PackageKit Hawkey backend
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Provides: PackageKit-backend
-Provides: PackageKit-zif = %{version}-%{release}
-Obsoletes: PackageKit-zif < 0.8.13-2
-
-%description hawkey
-A backend for PackageKit to enable Hawkey functionality.
-%endif
-
-%package docs
-Summary: Documentation for PackageKit
-BuildArch: noarch
-
-%description docs
-API docs for PackageKit.
-
-%package yum-plugin
-Summary: Tell PackageKit to check for updates when yum exits
-Requires: yum >= 3.0
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: dbus-python
-Obsoletes: yum-packagekit < %{version}-%{release}
-
-%description yum-plugin
-PackageKit-yum-plugin tells PackageKit to check for updates when yum exits.
-This way, if you run 'yum update' and install all available updates, puplet
-will almost instantly update itself to reflect this.
-
 %package glib
 Summary: GLib libraries for accessing PackageKit
 Requires: dbus >= 1.1.1
@@ -144,14 +113,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description cron
 Crontab and utilities for running PackageKit as a cron job.
 
-%package debug-install
-Summary: Facility to install debugging packages using PackageKit
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: PackageKit-debuginfo-install <= 0.5.2-0.1.20090902git.fc12
-
-%description debug-install
-Provides facility to install debugging packages using PackageKit.
-
 %package glib-devel
 Summary: GLib Libraries and headers for PackageKit
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
@@ -159,6 +120,8 @@ Requires: dbus-devel%{?_isa} >= 1.1.1
 Requires: sqlite-devel%{?_isa}
 Obsoletes: PackageKit-devel < %{version}-%{release}
 Provides: PackageKit-devel = %{version}-%{release}
+Obsoletes: PackageKit-docs < %{version}-%{release}
+Provides: PackageKit-docs = %{version}-%{release}
 
 %description glib-devel
 GLib headers and libraries for PackageKit.
@@ -185,7 +148,6 @@ using PackageKit.
 
 %package gstreamer-plugin
 Summary: Install GStreamer codecs using PackageKit
-Requires: gstreamer
 Requires: %{name}-glib%{?_isa} = %{version}-%{release}
 Obsoletes: codeina < 0.10.1-10
 Provides: codeina = 0.10.1-10
@@ -214,15 +176,13 @@ using PackageKit.
 
 %prep
 %setup -q
+#%setup -q -n %{name}-%{version}-%{gitdate}
 %patch0 -p1 -b .fedora
-%patch4 -p1 -b .xulrunner2
-
-NOCONFIGURE=1 ./autogen.sh
 
 %build
 %configure \
         --disable-static \
-        --enable-yum \
+        --enable-python3 \
 %if 0%{?rhel} == 0
         --enable-hawkey \
         --enable-introspection \
@@ -231,6 +191,7 @@ NOCONFIGURE=1 ./autogen.sh
         --disable-bash-completion \
 %endif
         --with-default-backend=auto \
+        --with-python-package-dir=%{python3_sitearch} \
         --disable-local \
         --disable-strict \
         --disable-silent-rules \
@@ -243,7 +204,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpackagekit*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-plugins/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-plugins-2/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/*.la
@@ -267,10 +228,16 @@ popd > /dev/null
 %find_lang %name
 
 %post
-systemctl enable packagekit-offline-update.service &> /dev/null || :
+%systemd_post packagekit-offline-update.service packagekit.service
 
 %post glib -p /sbin/ldconfig
 
+%preun
+%systemd_preun packagekit-offline-update.service packagekit.service
+
+%postun
+%systemd_postun_with_restart packagekit-offline-update.service packagekit.service
+
 %postun glib -p /sbin/ldconfig
 
 %files -f %{name}.lang
@@ -284,12 +251,12 @@ systemctl enable packagekit-offline-update.service &> /dev/null || :
 %dir %{_sysconfdir}/PackageKit/events/pre-transaction.d
 %{_sysconfdir}/PackageKit/events/*.d/README
 %dir %{_localstatedir}/lib/PackageKit
-%dir %{python_sitelib}/packagekit
+%dir %{python3_sitearch}/packagekit
 %dir %{_localstatedir}/cache/PackageKit
 %ghost %verify(not md5 size mtime) %{_localstatedir}/cache/PackageKit/groups.sqlite
 %dir %{_localstatedir}/cache/PackageKit/downloads
 %dir %{_localstatedir}/cache/PackageKit/metadata
-%{python_sitelib}/packagekit/*py*
+%{python3_sitearch}/packagekit/*py*
 %if !0%{?rhel}
 %{_datadir}/bash-completion/completions/pkcon
 %endif
@@ -302,47 +269,30 @@ systemctl enable packagekit-offline-update.service &> /dev/null || :
 %{_datadir}/PackageKit/helpers/test_spawn/*
 %{_datadir}/man/man1/pkcon.1.gz
 %{_datadir}/man/man1/pkmon.1.gz
+%{_datadir}/man/man1/pk-debuginfo-install.1.gz
 %{_datadir}/polkit-1/actions/*.policy
 %{_datadir}/polkit-1/rules.d/*
 %{_datadir}/PackageKit/pk-upgrade-distro.sh
 %{_libexecdir}/packagekitd
 %{_bindir}/pkmon
 %{_bindir}/pkcon
-%{_bindir}/packagekit-bugreport.sh
+%{_bindir}/pk-debuginfo-install
 %exclude %{_libdir}/libpackagekit*.so.*
 %{_libdir}/packagekit-backend/libpk_backend_dummy.so
 %{_libdir}/packagekit-backend/libpk_backend_test_*.so
 %ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db
 %{_datadir}/dbus-1/system-services/*.service
-%dir %{_libdir}/packagekit-plugins
-%{_libdir}/packagekit-plugins/*.so
+%dir %{_libdir}/packagekit-plugins-2
+%{_libdir}/packagekit-plugins-2/*.so
 %{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib
 %{_datadir}/dbus-1/interfaces/*.xml
-/usr/lib/systemd/system/packagekit-offline-update.service
-/usr/lib/systemd/system/packagekit.service
+%{_unitdir}/packagekit-offline-update.service
+%{_unitdir}/packagekit.service
 %{_libexecdir}/pk-*offline-update
-
-%files docs
-%defattr(-,root,root,-)
-%{_datadir}/gtk-doc/html/PackageKit
-
-%files yum
-%defattr(-,root,root,-)
-%{_libdir}/packagekit-backend/libpk_backend_yum.so
-%dir %{_datadir}/PackageKit/helpers/yum
-%{_datadir}/PackageKit/helpers/yum/*
-
 %if 0%{?rhel} == 0
-%files hawkey
-%defattr(-,root,root,-)
 %{_libdir}/packagekit-backend/libpk_backend_hawkey.so
 %endif
 
-%files yum-plugin
-%defattr(-, root, root)
-%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/refresh-packagekit.conf
-/usr/lib/yum-plugins/refresh-packagekit.*
-
 %files glib
 %defattr(-,root,root,-)
 %{_libdir}/*packagekit-glib2.so.*
@@ -353,11 +303,6 @@ systemctl enable packagekit-offline-update.service &> /dev/null || :
 %config %{_sysconfdir}/cron.daily/packagekit-background.cron
 %config(noreplace) %{_sysconfdir}/sysconfig/packagekit-background
 
-%files debug-install
-%defattr(-,root,root,-)
-%{_bindir}/pk-debuginfo-install
-%{_datadir}/man/man1/pk-debuginfo-install.1.gz
-
 %files browser-plugin
 %defattr(-,root,root,-)
 %{_libdir}/mozilla/plugins/packagekit-plugin.so
@@ -388,6 +333,7 @@ systemctl enable packagekit-offline-update.service &> /dev/null || :
 %{_includedir}/PackageKit/packagekit-glib*/*.h
 %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir
 %{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir
+%{_datadir}/gtk-doc/html/PackageKit
 
 %files backend-devel
 %defattr(-,root,root,-)
@@ -396,6 +342,15 @@ systemctl enable packagekit-offline-update.service &> /dev/null || :
 %{_libdir}/pkgconfig/packagekit-plugin.pc
 
 %changelog
+* Tue Apr 29 2014 Richard Hughes <rhughes at redhat.com> - 0.9.2-1
+- New upstream release
+- Don't crash when polkit_authority_get_sync() fails
+- Fix get-roles and remove trailing semicolon on repo-set-data
+- Link gstreamer plugin against 1.0 as well
+- Only search for packages when shell is interactive
+- Reduce logging verbosity in systemd-updates
+- Show the full package name and version in the systemd-updates logs
+
 * Fri Mar 21 2014 Richard Hughes <rhughes at redhat.com> - 0.8.17-1
 - New upstream release
 - Allow optionally shutting down after applying updates
diff --git a/sources b/sources
index 9b97c76..38c82b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a2b1a602fee21430b735e52aaf33bd1a  PackageKit-0.8.17.tar.xz
+17ffc13ad8ad28a135b3093402b9254c  PackageKit-0.9.2.tar.xz


More information about the scm-commits mailing list