Merge branch 'f22' into f21
This commit is contained in:
commit
75d6820781
41
polkit.spec
41
polkit.spec
@ -6,7 +6,7 @@
|
|||||||
Summary: An authorization framework
|
Summary: An authorization framework
|
||||||
Name: polkit
|
Name: polkit
|
||||||
Version: 0.113
|
Version: 0.113
|
||||||
Release: 2%{?dist}
|
Release: 4%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.freedesktop.org/wiki/Software/polkit
|
URL: http://www.freedesktop.org/wiki/Software/polkit
|
||||||
Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz
|
Source0: http://www.freedesktop.org/software/polkit/releases/%{name}-%{version}.tar.gz
|
||||||
@ -28,6 +28,7 @@ BuildRequires: libtool
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Requires: dbus, polkit-pkla-compat
|
Requires: dbus, polkit-pkla-compat
|
||||||
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
|
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
Requires(post): /sbin/ldconfig, systemd
|
Requires(post): /sbin/ldconfig, systemd
|
||||||
@ -47,6 +48,9 @@ Provides: polkit-desktop-policy = 0.103
|
|||||||
Obsoletes: polkit-js-engine < 0.110-4
|
Obsoletes: polkit-js-engine < 0.110-4
|
||||||
Provides: polkit-js-engine = %{version}-%{release}
|
Provides: polkit-js-engine = %{version}-%{release}
|
||||||
|
|
||||||
|
# when -libs was split out, handle multilib upgrade path -- rex
|
||||||
|
Obsoletes: polkit < 0.113-3
|
||||||
|
|
||||||
%description
|
%description
|
||||||
polkit is a toolkit for defining and handling authorizations. It is
|
polkit is a toolkit for defining and handling authorizations. It is
|
||||||
used for allowing unprivileged processes to speak to privileged
|
used for allowing unprivileged processes to speak to privileged
|
||||||
@ -55,7 +59,7 @@ processes.
|
|||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for polkit
|
Summary: Development files for polkit
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %name = %{version}-%{release}
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||||
Requires: %name-docs = %{version}-%{release}
|
Requires: %name-docs = %{version}-%{release}
|
||||||
Requires: glib2-devel
|
Requires: glib2-devel
|
||||||
Obsoletes: PolicyKit-devel <= 0.10
|
Obsoletes: PolicyKit-devel <= 0.10
|
||||||
@ -75,6 +79,14 @@ BuildArch: noarch
|
|||||||
%description docs
|
%description docs
|
||||||
Development documentation for polkit.
|
Development documentation for polkit.
|
||||||
|
|
||||||
|
%package libs
|
||||||
|
Summary: Libraries for polkit
|
||||||
|
Group: Development/Libraries
|
||||||
|
|
||||||
|
%description libs
|
||||||
|
Libraries files for polkit.
|
||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
@ -106,7 +118,6 @@ getent passwd polkitd >/dev/null || useradd -r -g polkitd -d / -s /sbin/nologin
|
|||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
%post
|
%post
|
||||||
/sbin/ldconfig
|
|
||||||
# The implied (systemctl preset) will fail and complain, but the macro hides
|
# 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
|
# 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.
|
# have an [Install] section and it is always started on demand.
|
||||||
@ -116,13 +127,11 @@ exit 0
|
|||||||
%systemd_preun polkit.service
|
%systemd_preun polkit.service
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
/sbin/ldconfig
|
|
||||||
%systemd_postun_with_restart polkit.service
|
%systemd_postun_with_restart polkit.service
|
||||||
|
|
||||||
%files -f polkit-1.lang
|
%files -f polkit-1.lang
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc COPYING NEWS README
|
%doc COPYING NEWS README
|
||||||
%{_libdir}/lib*.so.*
|
|
||||||
%{_datadir}/man/man1/*
|
%{_datadir}/man/man1/*
|
||||||
%{_datadir}/man/man8/*
|
%{_datadir}/man/man8/*
|
||||||
%{_datadir}/dbus-1/system-services/*
|
%{_datadir}/dbus-1/system-services/*
|
||||||
@ -141,7 +150,6 @@ exit 0
|
|||||||
%{_bindir}/pkttyagent
|
%{_bindir}/pkttyagent
|
||||||
%dir %{_prefix}/lib/polkit-1
|
%dir %{_prefix}/lib/polkit-1
|
||||||
%{_prefix}/lib/polkit-1/polkitd
|
%{_prefix}/lib/polkit-1/polkitd
|
||||||
%{_libdir}/girepository-1.0/*.typelib
|
|
||||||
|
|
||||||
# see upstream docs for why these permissions are necessary
|
# see upstream docs for why these permissions are necessary
|
||||||
%attr(4755,root,root) %{_bindir}/pkexec
|
%attr(4755,root,root) %{_bindir}/pkexec
|
||||||
@ -158,10 +166,25 @@ exit 0
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_datadir}/gtk-doc
|
%{_datadir}/gtk-doc
|
||||||
|
|
||||||
|
%post libs -p /sbin/ldconfig
|
||||||
|
%postun libs -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%files libs
|
||||||
|
%{_libdir}/lib*.so.*
|
||||||
|
%{_libdir}/girepository-1.0/*.typelib
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jul 9 2015 Miloslav Trmač <mitr@redhat.com> - 0.113-2
|
* Tue Jul 14 2015 Miloslav Trmač <mitr@redhat.com> - 0.113-4
|
||||||
- Revert the -libs split, it breaks upgrades of multilib (the multilib repos
|
- Bump the Obsoletes: to < 0.113-3 to account for the non-split 0.113-2.fc21
|
||||||
no longer contain the alternate-arch version of the polkit package)
|
Resolves: #1243004
|
||||||
|
|
||||||
|
* Sun Jul 12 2015 Rex Dieter <rdieter@fedoraproject.org> 0.113-3
|
||||||
|
- Obsoletes: polkit < 0.112-8 (handle multilib upgrade path)
|
||||||
|
|
||||||
|
* Fri Jul 10 2015 Miloslav Trmač <mitr@redhat.com> - 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č <mitr@redhat.com> - 0.113-1
|
* 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,
|
- Update to polkit-0.113 (CVE-2015-3218, CVE-2015-3255, CVE-2015-3256,
|
||||||
|
Loading…
Reference in New Issue
Block a user