[polkit] Update to upstream release 0.103 Drop upstreamed patch Drop Fedora-specific policy, it is now upstre

[David Zeuthen]

commit cdaf292035f92d5183578feb077c74804caf29e2
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Dec 6 11:03:28 2011 -0500

    Update to upstream release 0.103
    Drop upstreamed patch
    Drop Fedora-specific policy, it is now upstream (fdo #41008)

 .gitignore                                  |    1 +
 polkit-0.102-neuter-stdout-and-stderr.patch |   77 ---------------------------
 polkit.spec                                 |   64 +++-------------------
 sources                                     |    2 +-
 4 files changed, 11 insertions(+), 133 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4828b02..e25d92f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ polkit-0.98.tar.gz
 /polkit-0.100.tar.gz
 /polkit-0.101.tar.gz
 /polkit-0.102.tar.gz
+/polkit-0.103.tar.gz
diff --git a/polkit.spec b/polkit.spec
index 4fcf580..48b1b04 100644
--- a/polkit.spec
+++ b/polkit.spec
@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
-Version: 0.102
-Release: 3%{?dist}
+Version: 0.103
+Release: 1%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -23,7 +23,8 @@ Provides: PolicyKit = 0.11
 # sufficiently new polkit-gnome package
 Conflicts: polkit-gnome < 0.97
 
-Patch0: polkit-0.102-neuter-stdout-and-stderr.patch
+Obsoletes: polkit-desktop-policy < 0.103
+Provides: polkit-desktop-policy = 0.103
 
 %description
 PolicyKit is a toolkit for defining and handling authorizations.
@@ -52,22 +53,8 @@ Provides: PolicyKit-docs = 0.11
 %description docs
 Development documentation for PolicyKit.
 
-%package desktop-policy
-Summary: PolicyKit policy for desktop users
-Group: Development/Libraries
-#Requires: %name = %{version}-%{release}
-BuildArch: noarch
-
-%description desktop-policy
-This package contains configuration directives to make PolicyKit use
-members of the wheel group when administrator authentication is
-required. Additionally, the package also contain configuration
-directives to allow users in the wheel group to do certain actions
-without being interrupted by password dialogs
-
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure --enable-gtk-doc \
@@ -85,48 +72,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/polkit-1/extensions/*.la
 
 %find_lang polkit-1
 
-###
-### BEGIN DESKTOP POLICY CONFIGURATION ###
-###
-
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/polkit-1/localauthority.conf.d/60-desktop-policy.conf << EOF
-# This allows users in the wheel group to authenticate as the
-# administrator.
-#
-# DO NOT EDIT THIS FILE, it will be overwritten on update.
-
-[Configuration]
-AdminIdentities=unix-group:wheel
-EOF
-
-cat > $RPM_BUILD_ROOT%{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d/10-desktop-policy.pkla << EOF
-# Authorizations/policy for the wheel group.
-#
-# DO NOT EDIT THIS FILE, it will be overwritten on update.
-#
-# Allow users in the wheel group to do certain actions without being
-# interrupted by password dialogs
-#
-[Wheel Group Permissions]
-Identity=unix-group:wheel
-Action=org.gnome.settingsdaemon.datetimemechanism.*;org.kde.kcontrol.kcmclock.save;org.freedesktop.RealtimeKit1.*;org.freedesktop.udisks.filesystem-mount-system-internal;org.freedesktop.hostname1.set-static-hostname
-ResultAny=auth_admin
-ResultInactive=auth_admin
-ResultActive=yes
-EOF
-
-###
-### END DESKTOP POLICY CONFIGURATION
-###
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%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
-
 %files -f polkit-1.lang
 %defattr(-,root,root,-)
 %doc COPYING
@@ -175,6 +124,11 @@ EOF
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Dec 06 2011 David Zeuthen <davidz at redhat.com> 0.103-1%{?dist}
+- Update to upstream release 0.103
+- Drop upstreamed patch
+- Drop Fedora-specific policy, it is now upstream (fdo #41008)
+
 * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.102-3
 - Rebuilt for glibc bug#747377
 
diff --git a/sources b/sources
index e405c6d..e2f7f80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3726bdb9728c103e58f62131e26693a  polkit-0.102.tar.gz
+aaacf2ef18774ea8a825a426a7cfe763  polkit-0.103.tar.gz