diff --git a/polkit.spec b/polkit.spec index 68d0987..f533d93 100644 --- a/polkit.spec +++ b/polkit.spec @@ -6,7 +6,7 @@ Summary: polkit Authorization Framework Name: polkit Version: 0.110 -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 @@ -26,7 +26,7 @@ BuildRequires: automake BuildRequires: libtool %endif -Requires: dbus +Requires: dbus, js Requires(pre): shadow-utils @@ -40,6 +40,9 @@ Conflicts: polkit-gnome < 0.97 Obsoletes: polkit-desktop-policy < 0.103 Provides: polkit-desktop-policy = 0.103 +Obsoletes: polkit-js-engine < 0.110-4 +Provides: polkit-js-engine = %{version}-%{release} + %description polkit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged @@ -68,15 +71,6 @@ BuildArch: noarch %description docs Development documentation for polkit. -%package js-engine -Summary: Meta-package for JavaScript engine used by polkit -Group: Development/Libraries -Requires: %name = %{version}-%{release} -Requires: js - -%description js-engine -Meta-package for JavaScript engine used by polkit. - %prep %setup -q @@ -101,12 +95,6 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.la -mkdir polkit-js-engine -cat > polkit-js-engine/README << EOF -This is a meta-package to pull in the required JavaScript packages to -make polkit authorization rules work. -EOF - %find_lang polkit-1 %pre @@ -157,11 +145,11 @@ exit 0 %defattr(-,root,root,-) %{_datadir}/gtk-doc -%files js-engine -%defattr(-,root,root,-) -%doc polkit-js-engine/README - %changelog +* Fri May 10 2013 Miloslav Trmač - 0.110-4 +- Make the JavaScript engine mandatory. The polkit-js-engine package has been + removed, main polkit package Provides:polkit-js-engine for compatibility. + * Wed Feb 13 2013 Miloslav Trmač - 0.110-3 - Don't ship pk-example-frobnicate in the "live" configuration Resolves: #878112