Revert the -libs split

On multilib systems (with both archs of polkit installed), the -libs
split causes only polkit-libs, not polkit, to be included in the
alternate-arch variant in the repo; so there is nothing to update the
alternate-arch polkit package to.
This commit is contained in:
Miloslav Trmač 2015-07-09 19:54:20 +02:00
parent 88b1a1546d
commit 8604959986

View File

@ -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
@ -75,14 +75,6 @@ BuildArch: noarch
%description docs
Development documentation for polkit.
%package libs
Summary: Libraries for polkit
Group: Development/Libraries
%description libs
Libraries files for polkit.
%prep
%setup -q
@ -114,6 +106,7 @@ getent passwd polkitd >/dev/null || useradd -r -g polkitd -d / -s /sbin/nologin
exit 0
%post
/sbin/ldconfig
# The implied (systemctl preset) will fail and complain, but the macro hides
# and ignores the fact. This is in fact what we want, polkit.service does not
# have an [Install] section and it is always started on demand.
@ -123,11 +116,13 @@ exit 0
%systemd_preun polkit.service
%postun
/sbin/ldconfig
%systemd_postun_with_restart polkit.service
%files -f polkit-1.lang
%defattr(-,root,root,-)
%doc COPYING NEWS README
%{_libdir}/lib*.so.*
%{_datadir}/man/man1/*
%{_datadir}/man/man8/*
%{_datadir}/dbus-1/system-services/*
@ -146,6 +141,7 @@ exit 0
%{_bindir}/pkttyagent
%dir %{_prefix}/lib/polkit-1
%{_prefix}/lib/polkit-1/polkitd
%{_libdir}/girepository-1.0/*.typelib
# see upstream docs for why these permissions are necessary
%attr(4755,root,root) %{_bindir}/pkexec
@ -162,14 +158,11 @@ exit 0
%defattr(-,root,root,-)
%{_datadir}/gtk-doc
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files libs
%{_libdir}/lib*.so.*
%{_libdir}/girepository-1.0/*.typelib
%changelog
* Thu Jul 9 2015 Miloslav Trmač <mitr@redhat.com> - 0.113-2
- Revert the -libs split, it breaks upgrades of multilib (the multilib repos
no longer contain the alternate-arch version of the polkit package)
* Thu Jul 2 2015 Miloslav Trmač <mitr@redhat.com> - 0.113-1
- Update to polkit-0.113 (CVE-2015-3218, CVE-2015-3255, CVE-2015-3256,
CVE-2015-4625)