Merge branch 'master' into f20

This commit is contained in:
Rex Dieter 2013-10-10 18:49:28 -05:00
commit f9d0e9921c

View File

@ -6,7 +6,7 @@
Summary: Package management service
Name: PackageKit
Version: 0.8.11
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.packagekit.org
Source0: http://www.packagekit.org/releases/%{name}-%{version}.tar.xz
@ -159,7 +159,7 @@ GLib libraries for accessing PackageKit.
%package cron
Summary: Cron job and related utilities for PackageKit
Group: System Environment/Base
Requires: cronie
Requires: crontabs
Requires: %{name}%{?_isa} = %{version}-%{release}
%description cron
@ -455,6 +455,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%{_libdir}/pkgconfig/packagekit-plugin.pc
%changelog
* Thu Oct 10 2013 Jóhann B. Guðmundsson <johannbg@fedoraproject.org> - 0.8.11-3
- -cron: require crontabs instead of cronie (#989090)
* Mon Sep 23 2013 Richard Hughes <rhughes@redhat.com> - 0.8.11-2
- Backport the package history functionality from master and some other
related bug fixes for gnome-software.