From a491b9639ba59b5498fd1b99097d559845cb235c Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 2 Dec 2013 15:25:49 +0000 Subject: [PATCH] New upstream release --- .gitignore | 1 + PackageKit-0.3.8-Fedora-Vendor.conf.patch | 25 ++----- ...eKit-0.4.4-Fedora-turn-off-time.conf.patch | 13 ---- PackageKit.spec | 71 ++++++------------- sources | 2 +- 5 files changed, 27 insertions(+), 85 deletions(-) delete mode 100644 PackageKit-0.4.4-Fedora-turn-off-time.conf.patch diff --git a/.gitignore b/.gitignore index ef0f786..d8842a8 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ PackageKit-0.6.7.tar.bz2 /PackageKit-0.8.11.tar.xz /PackageKit-0.8.12.tar.xz /PackageKit-0.8.13.tar.xz +/PackageKit-0.8.14.tar.xz diff --git a/PackageKit-0.3.8-Fedora-Vendor.conf.patch b/PackageKit-0.3.8-Fedora-Vendor.conf.patch index cff2cbf..9eafb8e 100644 --- a/PackageKit-0.3.8-Fedora-Vendor.conf.patch +++ b/PackageKit-0.3.8-Fedora-Vendor.conf.patch @@ -1,7 +1,6 @@ -diff --git a/etc/Vendor.conf b/etc/Vendor.conf -index 69f7337..6c6f772 100644 ---- a/etc/Vendor.conf -+++ b/etc/Vendor.conf +diff -urNp PackageKit-0.8.14.old/etc/Vendor.conf PackageKit-0.8.14/etc/Vendor.conf +--- PackageKit-0.8.14.old/etc/Vendor.conf 2013-12-02 15:14:19.644838900 +0000 ++++ PackageKit-0.8.14/etc/Vendor.conf 2013-12-02 15:15:26.956925038 +0000 @@ -12,7 +12,7 @@ # If the value is set to 'none' then no link is shown. # @@ -11,7 +10,7 @@ index 69f7337..6c6f772 100644 # The URL which is shown to the user when a codec could not be found. # It should explain why certain codecs cannot be used, and perhaps show -@@ -21,7 +21,7 @@ DefaultUrl=http://www.packagekit.org/pk-package-not-found.html +@@ -21,7 +21,7 @@ DefaultUrl=http://www.packagekit.org/pk- # If the value is set to 'none' then the value of DefaultUrl is used. # # default=none @@ -38,23 +37,9 @@ index 69f7337..6c6f772 100644 # The URL which is shown to the user when programs handing a mime tpye could not # be found. It should probably explain how to use wine if the program is a -@@ -47,16 +47,16 @@ FontUrl=none +@@ -47,4 +47,4 @@ FontUrl=none # If the value is set to 'none' then the value of DefaultUrl is used. # # default=none -MimeUrl=none +MimeUrl=https://fedoraproject.org/wiki/PackageKit_Items_Not_Found#Missing_MIME_Support - - [Groups] - - # The vendor name shown for the 'vendor' group - # - # default=My Vendor --VendorName=My Vendor -+VendorName=Fedora - - # The vendor icon name shown for the 'vendor' group - # - # default=emblem-favorite --VendorIcon=emblem-favorite -+VendorIcon=fedora-logo-small diff --git a/PackageKit-0.4.4-Fedora-turn-off-time.conf.patch b/PackageKit-0.4.4-Fedora-turn-off-time.conf.patch deleted file mode 100644 index 96c2bef..0000000 --- a/PackageKit-0.4.4-Fedora-turn-off-time.conf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/etc/PackageKit.conf.in b/etc/PackageKit.conf.in -index bc0bea2..67e15f7 100644 ---- a/etc/PackageKit.conf.in -+++ b/etc/PackageKit.conf.in -@@ -27,7 +27,7 @@ UseNetworkHeuristic=true - # enough and will not be set at the very start or end of a transaction. - # - # default=true --UseRemainingTimeEstimation=true -+UseRemainingTimeEstimation=false - - # Shut down the daemon after this many seconds idle. 0 means don't shutdown. - # diff --git a/PackageKit.spec b/PackageKit.spec index dcacf05..2554da6 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -5,7 +5,7 @@ Summary: Package management service Name: PackageKit -Version: 0.8.13 +Version: 0.8.14 Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org @@ -14,9 +14,6 @@ Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz # Fedora-specific: set Vendor.conf up for Fedora. 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 - # Upstreamable? allow use of xulrunner2 for browser-plugin support Patch4: PackageKit-0.7.4-xulrunner2.patch @@ -54,12 +51,10 @@ BuildRequires: libarchive-devel BuildRequires: gstreamer-devel BuildRequires: gstreamer-plugins-base-devel BuildRequires: pango-devel -BuildRequires: pm-utils-devel BuildRequires: fontconfig-devel BuildRequires: systemd-devel BuildRequires: gobject-introspection-devel %if !0%{?rhel} -BuildRequires: zif-devel >= 0.2.5 BuildRequires: bash-completion %endif @@ -80,6 +75,10 @@ Obsoletes: PackageKit-gtk-module < %{version}-%{release} # No more smart in Fedora Obsoletes: PackageKit-smart < %{version}-%{release} +# Udev no longer provides this functionality +Provides: PackageKit-device-rebind = %{version}-%{release} +Obsoletes: PackageKit-device-rebind < 0.8.13-2 + %description PackageKit is a D-Bus abstraction layer that allows the session user to manage packages in a secure way using a cross-distro, @@ -97,24 +96,14 @@ Provides: PackageKit-backend %description yum A backend for PackageKit to enable yum functionality. -%if 0%{?rhel} == 0 -%package zif -Summary: PackageKit Zif backend -Group: System Environment/Libraries -Requires: zif >= 0.2.5 -Requires: %{name}%{?_isa} = %{version}-%{release} -Provides: PackageKit-backend - -%description zif -A backend for PackageKit to enable Zif functionality. -%endif - %if 0%{?rhel} == 0 %package hawkey Summary: PackageKit Hawkey backend Group: System Environment/Libraries 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. @@ -235,20 +224,9 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release} A simple helper that offers to install new packages on the command line using PackageKit. -%package device-rebind -Summary: Device rebind functionality for PackageKit -Group: Development/Libraries -Requires: %{name}-glib%{?_isa} = %{version}-%{release} - -%description device-rebind -The device rebind functionality offer the ability to re-initialize devices -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 %patch0 -p1 -b .fedora -%patch1 -p1 -b .no-time %patch4 -p1 -b .xulrunner2 NOCONFIGURE=1 ./autogen.sh @@ -259,7 +237,6 @@ NOCONFIGURE=1 ./autogen.sh --enable-yum \ --disable-bash-completion \ %if 0%{?rhel} == 0 - --enable-zif \ --enable-hawkey \ --enable-introspection \ --enable-bash-completion \ @@ -301,12 +278,8 @@ popd > /dev/null %find_lang %name %post -update-mime-database %{_datadir}/mime &> /dev/null || : systemctl enable packagekit-offline-update.service &> /dev/null || : -%postun -update-mime-database %{_datadir}/mime &> /dev/null || : - %post glib -p /sbin/ldconfig %postun glib -p /sbin/ldconfig @@ -340,23 +313,19 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_datadir}/PackageKit/helpers/test_spawn/* %{_datadir}/man/man1/pkcon.1.gz %{_datadir}/man/man1/pkmon.1.gz -%{_datadir}/man/man1/pkgenpack.1.gz %{_datadir}/polkit-1/actions/*.policy %{_datadir}/polkit-1/rules.d/* -%{_datadir}/mime/packages/packagekit-*.xml %{_datadir}/PackageKit/pk-upgrade-distro.sh %{_libexecdir}/packagekitd %{_libexecdir}/pk-trigger-offline-update %{_bindir}/pkmon %{_bindir}/pkcon -%{_bindir}/pkgenpack %{_bindir}/packagekit-bugreport.sh %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 -%{_libdir}/pm-utils/sleep.d/95packagekit %dir %{_libdir}/packagekit-plugins %{_libdir}/packagekit-plugins/*.so %{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib @@ -376,14 +345,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %dir %{_datadir}/PackageKit/helpers/yum %{_datadir}/PackageKit/helpers/yum/* -%if 0%{?rhel} == 0 -%files zif -%defattr(-,root,root,-) -%{_libdir}/packagekit-backend/libpk_backend_zif.so -%dir %{_datadir}/PackageKit/helpers/zif -%{_datadir}/PackageKit/helpers/zif/* -%endif - %if 0%{?rhel} == 0 %files hawkey %defattr(-,root,root,-) @@ -431,11 +392,6 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libexecdir}/pk-command-not-found %config(noreplace) %{_sysconfdir}/PackageKit/CommandNotFound.conf -%files device-rebind -%defattr(-,root,root,-) -%{_sbindir}/pk-device-rebind -%{_datadir}/man/man1/pk-device-rebind.1.gz - %files glib-devel %defattr(-,root,root,-) %{_libdir}/libpackagekit-glib2.so @@ -453,6 +409,19 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Mon Dec 02 2013 Richard Hughes - 0.8.14-1 +- New upstream release +- Cache the loaded hawkey sacks to save 280ms for repeat transactions +- Deprecate service packs, catalogs and messages +- Do not check processes when updating as this is racy +- Do not hardcode x86_64 as the native architecture for hawkey +- Many daemon speedups for common operations +- Remove PmUtils script helper as pm-utils is dead upstream +- Remove quite a few config options that didn't make sense +- Remove the Udev firmware loading functionality as it's removed from systemd +- Remove the zif backend as nearly all functionality is available in hawkey +- Speed up common operations in lipackagekit-glib + * Fri Nov 22 2013 Richard Hughes - 0.8.13-1 - New upstream release - Add a systemd packagekit.service file diff --git a/sources b/sources index 35c8eb1..601ca13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8f7207cca4fcdb3d62d012b67c2f319 PackageKit-0.8.13.tar.xz +72fcf8b7c0ed40d0aff73d0cf78cb428 PackageKit-0.8.14.tar.xz