X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=PolicyKit.spec;h=fe247309f41b5157ba6d2371588de3e717dd57b4;hb=ec45ca8ec2821ffa394161f3b5e72b6f3acd9051;hp=b091b0cdc72a05fcb3fc810656bcdfc148348275;hpb=55c37b35326852f08da9f22e6f348cc03225a2ee;p=packages%2FPolicyKit.git

diff --git a/PolicyKit.spec b/PolicyKit.spec
index b091b0c..fe24730 100644
--- a/PolicyKit.spec
+++ b/PolicyKit.spec
@@ -1,16 +1,18 @@
+# TODO: package bash-completion in proper way
 Summary:	A framework for defining policy for system-wide components
 Summary(pl.UTF-8):	Szkielet do definiowania polityki dla komponentów systemowych
 Name:		PolicyKit
-Version:	0.6
-Release:	2
-License:	GPL v2
+Version:	0.9
+Release:	3
+License:	MIT
 Group:		Libraries
 Source0:	http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	1d6a0b4bf82c2c3c2a119a66afe4708d
-URL:		http://people.freedesktop.org/~david/polkit-spec.html
+# Source0-md5:	802fd13ae41f73d79359e5ecb0a98716
+URL:		http://www.freedesktop.org/wiki/Software/PolicyKit
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	dbus-devel >= 1.0
+BuildRequires:	dbus-glib-devel >= 0.73
 BuildRequires:	expat-devel >= 1:1.95.8
 BuildRequires:	glib2-devel >= 1:2.6.0
 BuildRequires:	gtk-doc >= 1.3
@@ -30,11 +32,14 @@ Requires(pre):	/usr/sbin/useradd
 Requires(pre):	/usr/sbin/usermod
 Requires(triggerpostun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	ConsoleKit >= 0.2.1
+Requires:	ConsoleKit >= 0.4.1
+Requires:	dbus >= 1.1.2-5
 Provides:	group(polkituser)
 Provides:	user(polkituser)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libexecdir	%{_libdir}/%{name}
+
 %description
 PolicyKit is a framework for defining policy for system-wide
 components and for desktop pieces to configure it. It is used by HAL.
@@ -59,7 +64,6 @@ Dokumentacja API PolicyKit.
 %package libs
 Summary:	PolicyKit libraries
 Summary(pl.UTF-8):	Biblioteki PolicyKit
-License:	AFL v2.1 or GPL v2
 Group:		Libraries
 Requires:	dbus-libs >= 1.0
 Requires:	glib2 >= 1:2.6.0
@@ -74,11 +78,11 @@ Biblioteki PolicyKit.
 %package devel
 Summary:	Header files for PolicyKit
 Summary(pl.UTF-8):	Pliki nagłówkowe PolicyKit
-License:	AFL v2.1 or GPL v2
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	expat-devel >= 1:1.95.8
-Requires:	glib2-devel >= 1:2.6.0
+# polkit-grant
+#Requires:	glib2-devel >= 1:2.6.0
 # polkit-dbus and polkit-grant
 #Requires:	dbus-devel >= 1.0
 # polkit-dbus
@@ -93,7 +97,6 @@ Pliki nagłówkowe PolicyKit.
 %package static
 Summary:	Static PolicyKit libraries
 Summary(pl.UTF-8):	Statyczne biblioteki PolicyKit
-License:	AFL v2.1 or GPL v2
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
@@ -116,12 +119,12 @@ Statyczne biblioteki PolicyKit.
 	--with-html-dir=%{_gtkdocdir} \
 	--with-pam-include=system-auth \
 	--with-pam-module-dir=/%{_lib}/security
-%{__make} -j1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -j1 install \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/PolicyKit/modules/*.{la,a}
@@ -129,7 +132,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/PolicyKit/modules/*.{la,a}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerun	-- PolicyKit < 0.3
+%triggerun -- PolicyKit < 0.3
 %service -q PolicyKit stop
 /sbin/chkconfig --del PolicyKit
 
@@ -137,6 +140,12 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 220 polkituser
 %useradd -u 220 -d %{_datadir}/empty -c "PolicyKit User" -g polkituser polkituser
 
+%post
+umask 022
+touch /var/lib/misc/PolicyKit.reload
+chown polkituser:polkituser /var/lib/misc/PolicyKit.reload
+chmod 775 /var/lib/misc/PolicyKit.reload
+
 %postun
 if [ "$1" = "0" ]; then
 	%userremove polkituser
@@ -149,21 +158,36 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS README doc/TODO
-%attr(755,root,root) %{_bindir}/polkit-*
-%attr(2755,root,polkituser) %{_libdir}/polkit-grant-helper
-%attr(4750,root,polkituser) %{_libdir}/polkit-grant-helper-pam
+%attr(755,root,root) %{_bindir}/polkit-action
+%attr(755,root,root) %{_bindir}/polkit-auth
+%attr(755,root,root) %{_bindir}/polkit-config-file-validate
+%attr(755,root,root) %{_bindir}/polkit-policy-file-validate
+%dir %{_libexecdir}
+%attr(2755,root,polkituser) %{_libexecdir}/polkit-explicit-grant-helper
+%attr(2755,root,polkituser) %{_libexecdir}/polkit-grant-helper
+%attr(4754,root,polkituser) %{_libexecdir}/polkit-grant-helper-pam
+%attr(2755,root,polkituser) %{_libexecdir}/polkit-read-auth-helper
+%attr(4755,root,polkituser) %{_libexecdir}/polkit-resolve-exe-helper
+%attr(2755,root,polkituser) %{_libexecdir}/polkit-revoke-helper
+%attr(4755,polkituser,root) %{_libexecdir}/polkit-set-default-helper
+%attr(755,root,root) %{_libexecdir}/polkitd
 %dir %{_sysconfdir}/PolicyKit
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PolicyKit/PolicyKit.conf
+/etc/dbus-1/system.d/org.freedesktop.PolicyKit.conf
 /etc/pam.d/polkit
-%attr(775,polkituser,polkituser) /var/lib/PolicyKit
-%attr(775,polkituser,polkituser) /var/run/PolicyKit
+%{_datadir}/PolicyKit
+%{_datadir}/dbus-1/interfaces/org.freedesktop.PolicyKit.AuthenticationAgent.xml
+%{_datadir}/dbus-1/system-services/org.freedesktop.PolicyKit.service
+%attr(775,polkituser,polkituser) %ghost /var/lib/misc/PolicyKit.reload
+%attr(770,root,polkituser) /var/lib/PolicyKit
+%attr(755,polkituser,root) /var/lib/PolicyKit-public
+%attr(770,root,polkituser) /var/run/PolicyKit
+%{_mandir}/man1/polkit-action.1*
+%{_mandir}/man1/polkit-auth.1*
 %{_mandir}/man1/polkit-config-file-validate.1*
-%{_mandir}/man1/polkit-grant.1*
-%{_mandir}/man1/polkit-list-actions.1*
 %{_mandir}/man1/polkit-policy-file-validate.1*
 %{_mandir}/man5/PolicyKit.conf.5*
 %{_mandir}/man8/PolicyKit.8*
-%{_datadir}/PolicyKit
 
 %files apidocs
 %defattr(644,root,root,755)
@@ -174,8 +198,11 @@ fi
 # notes which license applies to which package part, AFL text (and GPL text copy)
 %doc COPYING
 %attr(755,root,root) %{_libdir}/libpolkit.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpolkit.so.2
 %attr(755,root,root) %{_libdir}/libpolkit-dbus.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpolkit-dbus.so.2
 %attr(755,root,root) %{_libdir}/libpolkit-grant.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpolkit-grant.so.2
 
 %files devel
 %defattr(644,root,root,755)