From 485463067b5613a6594250c3d9255454fd864d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Fri, 10 Jul 2015 19:03:00 +0200 Subject: [PATCH 1/3] Add and fix dependencies between subpackages --- polkit.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/polkit.spec b/polkit.spec index 48d0dec..c35f539 100644 --- a/polkit.spec +++ b/polkit.spec @@ -6,7 +6,7 @@ Summary: An authorization framework Name: polkit Version: 0.113 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/polkit Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz @@ -28,6 +28,7 @@ BuildRequires: libtool %endif Requires: dbus, polkit-pkla-compat +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires(pre): shadow-utils Requires(post): /sbin/ldconfig, systemd @@ -55,7 +56,7 @@ processes. %package devel Summary: Development files for polkit Group: Development/Libraries -Requires: %name = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %name-docs = %{version}-%{release} Requires: glib2-devel Obsoletes: PolicyKit-devel <= 0.10 @@ -170,6 +171,11 @@ exit 0 %{_libdir}/girepository-1.0/*.typelib %changelog +* Fri Jul 10 2015 Miloslav Trmač - 0.113-2 +- Add a fully versioned dependency from polkit to polkit-libs + Resolves: #1241759 +- Require polkit-libs, not polkit, in polkit-devel + * Thu Jul 2 2015 Miloslav Trmač - 0.113-1 - Update to polkit-0.113 (CVE-2015-3218, CVE-2015-3255, CVE-2015-3256, CVE-2015-4625) From f6926aa221c83423553efe2f13ae4fab61d6c159 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 12 Jul 2015 08:35:17 -0500 Subject: [PATCH 2/3] Obsoletes: polkit < 0.112-8 (handle multilib upgrade path) --- polkit.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/polkit.spec b/polkit.spec index c35f539..b0ad744 100644 --- a/polkit.spec +++ b/polkit.spec @@ -6,7 +6,7 @@ Summary: An authorization framework Name: polkit Version: 0.113 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/polkit Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz @@ -48,6 +48,9 @@ Provides: polkit-desktop-policy = 0.103 Obsoletes: polkit-js-engine < 0.110-4 Provides: polkit-js-engine = %{version}-%{release} +# when -libs was split out, handle multilib upgrade path -- rex +Obsoletes: polkit < 0.112-8 + %description polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged @@ -171,6 +174,9 @@ exit 0 %{_libdir}/girepository-1.0/*.typelib %changelog +* Sun Jul 12 2015 Rex Dieter 0.113-3 +- Obsoletes: polkit < 0.112-8 (handle multilib upgrade path) + * Fri Jul 10 2015 Miloslav Trmač - 0.113-2 - Add a fully versioned dependency from polkit to polkit-libs Resolves: #1241759 From a28dc78bfd6b22adeebda85e0178f03c8e8360e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 14 Jul 2015 23:12:47 +0200 Subject: [PATCH 3/3] Bump the Obsoletes: to < 0.113-3 to account for the non-split 0.113-2.fc21 --- polkit.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/polkit.spec b/polkit.spec index b0ad744..ef48555 100644 --- a/polkit.spec +++ b/polkit.spec @@ -6,7 +6,7 @@ Summary: An authorization framework Name: polkit Version: 0.113 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/polkit Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz @@ -49,7 +49,7 @@ Obsoletes: polkit-js-engine < 0.110-4 Provides: polkit-js-engine = %{version}-%{release} # when -libs was split out, handle multilib upgrade path -- rex -Obsoletes: polkit < 0.112-8 +Obsoletes: polkit < 0.113-3 %description polkit is a toolkit for defining and handling authorizations. It is @@ -174,6 +174,10 @@ exit 0 %{_libdir}/girepository-1.0/*.typelib %changelog +* Tue Jul 14 2015 Miloslav Trmač - 0.113-4 +- Bump the Obsoletes: to < 0.113-3 to account for the non-split 0.113-2.fc21 + Resolves: #1243004 + * Sun Jul 12 2015 Rex Dieter 0.113-3 - Obsoletes: polkit < 0.112-8 (handle multilib upgrade path)