From 188120764b57c22f51c5bff00c159a2a6353afff Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Sun, 13 Sep 2009 19:52:31 +0000 Subject: [PATCH] - Update to git snapshot - Drop upstreamed patches - Turn on GObject introspection - Don't delete desktop_admin_r and desktop_user_r groups when uninstalling polkit-desktop-policy --- .cvsignore | 1 + polkit.spec | 44 +++++++++++++++++++++----------------------- sources | 2 +- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index 780fa17..c3fa71d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ polkit-0.92.tar.gz polkit-0.93.tar.gz polkit-0.94.tar.gz +polkit-0.95.git20090913.tar.gz diff --git a/polkit.spec b/polkit.spec index d71b1c9..1f198a7 100644 --- a/polkit.spec +++ b/polkit.spec @@ -1,10 +1,10 @@ Summary: PolicyKit Authorization Framework Name: polkit -Version: 0.94 -Release: 4%{?dist} +Version: 0.95 +Release: 0.git20090913%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/PolicyKit -Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz +Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.git20090913.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Group: System Environment/Libraries BuildRequires: glib2-devel @@ -18,9 +18,6 @@ BuildRequires: gobject-introspection-devel Requires: ConsoleKit Requires: dbus -Patch0: 0001-Sort-by-action-id-in-pkaction-1-output.patch -Patch1: 0002-Bug-23867-UnixProcess-vs.-SystemBusName-aliasing.patch - %description PolicyKit is a toolkit for defining and handling authorizations. It is used for allowing unprivileged processes to speak to privileged @@ -59,11 +56,9 @@ Roles and default policy for desktop usage. %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -%configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --disable-introspection +%configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --enable-introspection --enable-examples make %install @@ -131,10 +126,6 @@ rm -rf $RPM_BUILD_ROOT /usr/sbin/groupadd -r desktop_admin_r 2> /dev/null || : /usr/sbin/groupadd -r desktop_user_r 2> /dev/null || : -%preun desktop-policy -/usr/sbin/groupdel desktop_admin_r 2> /dev/null || : -/usr/sbin/groupdel desktop_user_r 2> /dev/null || : - %files desktop-policy %{_sysconfdir}/polkit-1/localauthority.conf.d/60-desktop-policy.conf %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d/10-desktop-policy.pkla @@ -157,27 +148,27 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/polkit-1 %{_bindir}/pkaction %{_bindir}/pkcheck +%{_bindir}/pklalockdown %{_libexecdir}/polkit-1/polkitd -#%{_libdir}/girepository-1.0/*.typelib +%{_libdir}/girepository-1.0/*.typelib # see upstream docs for why these permissions are necessary -%attr(0700,root,root) %dir %{_localstatedir}/lib/polkit-1/ %attr(4755,root,root) %{_bindir}/pkexec %attr(4755,root,root) %{_libexecdir}/polkit-1/polkit-agent-helper-1 -%attr(0700,root,root) %dir /var/lib/polkit-1/ -%dir /var/lib/polkit-1/localauthority -%dir /var/lib/polkit-1/localauthority/10-vendor.d -%dir /var/lib/polkit-1/localauthority/20-org.d -%dir /var/lib/polkit-1/localauthority/30-site.d -%dir /var/lib/polkit-1/localauthority/50-local.d -%dir /var/lib/polkit-1/localauthority/90-mandatory.d +%attr(0700,root,root) %dir %{_localstatedir}/lib/polkit-1/ +%dir %{_localstatedir}/lib/polkit-1/localauthority +%dir %{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d +%dir %{_localstatedir}/lib/polkit-1/localauthority/20-org.d +%dir %{_localstatedir}/lib/polkit-1/localauthority/30-site.d +%dir %{_localstatedir}/lib/polkit-1/localauthority/50-local.d +%dir %{_localstatedir}/lib/polkit-1/localauthority/90-mandatory.d %files devel %defattr(-,root,root,-) %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -#%{_datadir}/gir-1.0/*.gir +%{_datadir}/gir-1.0/*.gir %{_includedir}/* %{_bindir}/pk-example-frobnicate %{_datadir}/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy @@ -187,6 +178,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun Sep 13 2009 David Zeuthen - 0.95-0.git20090913 +- Update to git snapshot +- Drop upstreamed patches +- Turn on GObject introspection +- Don't delete desktop_admin_r and desktop_user_r groups when + uninstalling polkit-desktop-policy + * Fri Sep 11 2009 David Zeuthen - 0.94-4 - Add some patches from git master - Sort pkaction(1) output diff --git a/sources b/sources index 69fbf35..9a9dd32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5abc9f858e7b614ef41161db36d53915 polkit-0.94.tar.gz +205463b529dd5c475883433515e5b668 polkit-0.95.git20090913.tar.gz