[gksu-polkit/f17: 5/5] Merge branch 'master' into f17

[Dan Mashal]

commit 70de6489700292aa9edaacca4c0c38258b9ac06c
Merge: 4712d39 1e14c1c
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Sun Feb 24 20:08:35 2013 -0800

    Merge branch 'master' into f17
    
    Conflicts:
    	gksu-polkit.spec

 gksu-polkit-0.0.3-policy.patch |   23 +++++++++++++++++++++++
 gksu-polkit-dbus.patch         |    7 +++++++
 gksu-polkit-systemd_unit       |    7 +++++++
 gksu-polkit.spec               |   37 +++++++++++++++++++++++++++++--------
 4 files changed, 66 insertions(+), 8 deletions(-)
---
diff --cc gksu-polkit.spec
index e81f406,b5b515d..3a460d2
--- a/gksu-polkit.spec
+++ b/gksu-polkit.spec
@@@ -1,13 -1,17 +1,16 @@@
  Name:           gksu-polkit
  Version:        0.0.3
- Release:        3%{?dist}
 -Release:        5%{?dist}
++Release:        6%{?dist}
  Summary:        Command line utility to run programs as root
  
  License:        LGPLv3+
  URL:            http://live.gnome.org/gksu
  #There is no other download source for the time being
  Source0:        http://ftp.de.debian.org/debian/pool/main/g/gksu-polkit/%{name}_%{version}.orig.tar.gz
+ Source1:        %{name}-systemd_unit
+ Patch0:         %{name}-dbus.patch
+ Patch1:         %{name}-%{version}-policy.patch
  
 -
  BuildRequires:  dbus-glib-devel
  BuildRequires:  gtk2-devel
  BuildRequires:  libgee06-devel
@@@ -75,6 -88,13 +87,15 @@@ install -p %{SOURCE1} %{buildroot}/%{_u
  
  
  %changelog
++* Sun Feb 24 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 0.0.3-6
++- Add security patch as per RHBZ 886671
++
+ * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.3-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
 -
+ * Sat Sep 15 2012 Mario Blättermann <mariobl at fedoraproject.org> 0.0.3-4
+ - Added full systemd support via dbus
+ 
  * Fri Aug 10 2012 Mario Blättermann <mariobl at fedoraproject.org> 0.0.3-3
  - Removed find_lang macro, should be readded once there are real po files