From c3babeb8794af21feca944e19515579fd385680d Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 17 Jan 2012 18:59:51 +0000 Subject: [PATCH] New upstream release. Remove upstreamed patches --- .gitignore | 1 + PackageKit-0.6.21-fix-trusted-pkgs.patch | 34 --------------- PackageKit.spec | 55 ++++++++++-------------- sources | 2 +- 4 files changed, 25 insertions(+), 67 deletions(-) delete mode 100644 PackageKit-0.6.21-fix-trusted-pkgs.patch diff --git a/.gitignore b/.gitignore index a683f4a..02cd731 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ PackageKit-0.6.7.tar.bz2 /PackageKit-0.6.19.tar.xz /PackageKit-0.6.20.tar.xz /PackageKit-0.6.21.tar.xz +/PackageKit-0.7.2.tar.xz diff --git a/PackageKit-0.6.21-fix-trusted-pkgs.patch b/PackageKit-0.6.21-fix-trusted-pkgs.patch deleted file mode 100644 index 604fd1b..0000000 --- a/PackageKit-0.6.21-fix-trusted-pkgs.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7dbee21a7adbc25856b53532d0fe55f272f580bb Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Mon, 9 Jan 2012 15:51:17 +0100 -Subject: [PATCH] yum: don't request authorization for trusted packages - (#771746) - -Misunderstood PackageKitYumBackend._is_package_repo_signed() semantics, -revert to the implementation from before I fixed it till it broke. -(cherry picked from commit d99c430775a6de3e7e98819f5b5c0c6017d6edde) ---- - backends/yum/yumBackend.py | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py -index fd73f87..beb027e 100755 ---- a/backends/yum/yumBackend.py -+++ b/backends/yum/yumBackend.py -@@ -1706,12 +1706,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage): - signed = False - try: - repo = self.yumbase.repos.getRepo(pkg.repoid) -- if hasattr(repo, "_override_sigchecks"): -- # yum >= 3.2.29 -- signed = not repo._override_sigchecks -- else: -- # yum < 3.2.29 -- signed = repo.gpgcheck -+ signed = repo.gpgcheck - except yum.Errors.RepoError, e: - raise PkError(ERROR_REPO_NOT_AVAILABLE, _to_unicode(e)) - except exceptions.IOError, e: --- -1.7.7.5 - diff --git a/PackageKit.spec b/PackageKit.spec index 366f6f9..1bb6762 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -2,8 +2,8 @@ Summary: Package management service Name: PackageKit -Version: 0.6.21 -Release: 3%{?dist} +Version: 0.7.2 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.packagekit.org Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz @@ -14,9 +14,6 @@ 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 -# Upstreamed: yum: don't request authorization for trusted packages (#771746) -Patch2: PackageKit-0.6.21-fix-trusted-pkgs.patch - Requires: PackageKit-glib = %{version}-%{release} Requires: PackageKit-backend Requires: shared-mime-info @@ -57,6 +54,9 @@ BuildRequires: zif-devel >= 0.2.5 Obsoletes: PackageKit-udev-helper < %{version}-%{release} Obsoletes: udev-packagekit < %{version}-%{release} +# No more GTK+-2 plugin +Obsoletes: PackageKit-gtk-module < %{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, @@ -209,16 +209,6 @@ Provides: codeina = 0.10.1-10 The PackageKit GStreamer plugin allows any Gstreamer application to install codecs from configured repositories using PackageKit. -%package gtk-module -Summary: Install fonts automatically using PackageKit -Group: Development/Libraries -Requires: pango -Requires: PackageKit-glib = %{version}-%{release} - -%description gtk-module -The PackageKit GTK2+ module allows any Pango application to install -fonts from configured repositories using PackageKit. - %package gtk3-module Summary: Install fonts automatically using PackageKit Group: Development/Libraries @@ -253,7 +243,6 @@ 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 .fix-trusted-pkgs %build %configure \ @@ -264,7 +253,7 @@ user to restart the computer or remove and re-insert the device. --enable-smart \ --enable-introspection \ %endif - --with-default-backend=yum,zif \ + --with-default-backend=auto \ --disable-local \ --disable-strict \ --disable-tests @@ -276,8 +265,9 @@ 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}/mozilla/plugins/packagekit-plugin.la -rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-?.0/modules/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/libpackagekit-action-lookup.la touch $RPM_BUILD_ROOT%{_localstatedir}/cache/PackageKit/groups.sqlite @@ -351,6 +341,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %ghost %verify(not md5 size mtime) %{_localstatedir}/lib/PackageKit/transactions.db %{_datadir}/dbus-1/system-services/*.service %{_libdir}/pm-utils/sleep.d/95packagekit +%{_libdir}/packagekit-plugins/*.so +%{_libdir}/girepository-1.0/PackageKitPlugin-1.0.typelib +%{_datadir}/dbus-1/interfaces/*.xml %files docs %defattr(-,root,root,-) @@ -410,20 +403,19 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %files browser-plugin %defattr(-,root,root,-) -%{_libdir}/mozilla/plugins/packagekit-plugin.so +#%{_libdir}/mozilla/plugins/packagekit-plugin.so +# FIXME: F17 doesn't have a new enough npapi package %files gstreamer-plugin %defattr(-,root,root,-) %{_libexecdir}/pk-gstreamer-install %{_libexecdir}/gst-install-plugins-helper -%files gtk-module -%defattr(-,root,root,-) -%{_libdir}/gtk-2.0/modules/*.so - %files gtk3-module %defattr(-,root,root,-) %{_libdir}/gtk-3.0/modules/*.so +%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/*.desktop +%{_datadir}/glib-2.0/schemas/*.gschema.xml %files command-not-found %defattr(-,root,root,-) @@ -444,29 +436,28 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %dir %{_includedir}/PackageKit/packagekit-glib2 %{_includedir}/PackageKit/packagekit-glib*/*.h %{_datadir}/gir-1.0/PackageKitGlib-1.0.gir +%{_datadir}/gir-1.0/PackageKitPlugin-1.0.gir %files qt-devel %defattr(-,root,root,-) %{_libdir}/libpackagekit-qt*.so -%{_libdir}/pkgconfig/packagekit-qt.pc -%dir %{_includedir}/PackageKit -%dir %{_includedir}/PackageKit/packagekit-qt -%{_includedir}/PackageKit/packagekit-qt/QPackageKit -%{_includedir}/PackageKit/packagekit-qt/*.h -%{_datadir}/cmake/Modules/FindQPackageKit.cmake - -# qt2 new library %{_includedir}/PackageKit/packagekit-qt2/* %{_libdir}/pkgconfig/packagekit-qt2.pc -%{_datadir}/cmake/Modules/FindPackageKitQt2.cmake +%{_libdir}/cmake/packagekit-qt2/packagekit-qt2*.cmake %files backend-devel %defattr(-,root,root,-) %dir %{_includedir}/PackageKit %dir %{_includedir}/PackageKit/backend %{_includedir}/PackageKit/backend/*.h +%{_includedir}/PackageKit/plugin +%{_libdir}/pkgconfig/packagekit-plugin.pc %changelog +* Tue Jan 17 2012 Richard Hughes - 0.7.2-1 +- New upstream release. +- Remove upstreamed patches + * Thu Jan 12 2012 Fedora Release Engineering - 0.6.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 5ad309f..aa2a52d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -216ad7429d6ea263e7e300be25a01110 PackageKit-0.6.21.tar.xz +41fc5729c546f53af6a99befa289fea7 PackageKit-0.7.2.tar.xz