diff --git a/.gitignore b/.gitignore index 670dab4..ac933b3 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,6 @@ PackageKit-0.6.7.tar.bz2 /PackageKit-0.9.4.tar.xz /PackageKit-0.9.5.tar.xz /PackageKit-1.0.0.tar.xz -/cached-metadata.tar /PackageKit-1.0.1-20141015.tar.xz /PackageKit-1.0.1.tar.xz /PackageKit-1.0.3.tar.xz diff --git a/PackageKit.spec b/PackageKit.spec index a0e568e..5404ddc 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -7,14 +7,11 @@ Summary: Package management service Name: PackageKit Version: 1.0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and LGPLv2+ URL: http://www.freedesktop.org/software/PackageKit/ Source0: http://www.freedesktop.org/software/PackageKit/releases/%{name}-%{version}.tar.xz -# generated using contrib/generate-md-archive.sh in the PackageKit source tree -Source1: cached-metadata.tar - # Fedora-specific: set Vendor.conf up for Fedora. Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch @@ -70,6 +67,9 @@ Obsoletes: PackageKit-yum < 0.9.1 Obsoletes: PackageKit-yum-plugin < 0.9.1 Obsoletes: PackageKit-zif < 0.8.13-2 +# Removed in F23 +Obsoletes: PackageKit-cached-metadata < 1.0.10-2 + # components now built-in Obsoletes: PackageKit-debug-install < 0.9.1 Obsoletes: PackageKit-hawkey < 0.9.1 @@ -101,15 +101,6 @@ Provides: PackageKit-libs = %{version}-%{release} %description glib GLib libraries for accessing PackageKit. -%package cached-metadata -Summary: Cached metadata for PackageKit -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description cached-metadata -Cached metadata allows application installers to start instantly on the -LiveCD or installed system without downloading files from the internet or -regenerating the SAT caches. It can safely removed if not required. - %package cron Summary: Cron job and related utilities for PackageKit Requires: crontabs @@ -215,10 +206,6 @@ pushd ${RPM_BUILD_ROOT}%{_datadir}/PackageKit > /dev/null ln -s ../pixmaps/comps icons popd > /dev/null -# ship cached metadata on the LiveCD -# http://blogs.gnome.org/hughsie/2014/08/29/putting-packagekit-metadata-on-the-fedora-livecd/ -tar -xf %{SOURCE1} --directory=$RPM_BUILD_ROOT - %find_lang %name %post @@ -274,10 +261,6 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || : %{_libdir}/packagekit-backend/libpk_backend_hif.so %endif -%files cached-metadata -%{_datadir}/PackageKit/hawkey/ -%{_datadir}/PackageKit/metadata/ - %files glib %{_libdir}/*packagekit-glib2.so.* %{_libdir}/girepository-1.0/PackageKitGlib-1.0.typelib @@ -313,6 +296,9 @@ systemctl disable packagekit-offline-update.service > /dev/null 2>&1 || : %{_datadir}/gtk-doc/html/PackageKit %changelog +* Mon Oct 19 2015 Kalev Lember - 1.0.10-2 +- Remove PackageKit-cached-metadata subpackage + * Mon Sep 21 2015 Richard Hughes - 1.0.10-1 - Update to 1.0.10 to fix a couple of bugs in the offline updater diff --git a/sources b/sources index 0d1d9c6..d0b12b0 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ 2f00e3e55656a6e06da55e30ad5ef2f4 PackageKit-1.0.10.tar.xz -54d31514518f2a2fffd035d1c853501d cached-metadata.tar