[polkit: 2/2] Fix merge conflicts

[Matthias Clasen]

commit e48a851cc35460b44e11a361dfdbcfdfd2926693
Merge: c2842a1 63764f0
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Aug 18 13:26:42 2010 -0400

    Fix merge conflicts

 polkit-0.97-subject-scanning.patch |   76 ++++++++++++++++++++++++++++++++++++
 polkit.spec                        |   28 ++++++++++---
 2 files changed, 97 insertions(+), 7 deletions(-)
---
diff --cc polkit.spec
index f26fb2c,a772426..4e5d0cf
--- a/polkit.spec
+++ b/polkit.spec
@@@ -1,12 -1,13 +1,12 @@@
  Summary: PolicyKit Authorization Framework
  Name: polkit
  Version: 0.97
--Release: 3%{?dist}
++Release: 4%{?dist}
  License: LGPLv2+
  URL: http://www.freedesktop.org/wiki/Software/PolicyKit
  Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
  Group: System Environment/Libraries
- BuildRequires: glib2-devel >= 2.25.11
+ BuildRequires: glib2-devel >= 2.25.12
  BuildRequires: expat-devel
  BuildRequires: pam-devel
  BuildRequires: gtk-doc
@@@ -22,6 -20,13 +19,16 @@@ Requires: dbu
  Obsoletes: PolicyKit <= 0.10
  Provides: PolicyKit = 0.11
  
+ # polkit saw some API/ABI changes from 0.96 to 0.97 so require a
+ # sufficiently new polkit-gnome package
+ Conflicts: polkit-gnome < 0.97
+ 
+ # upstream
+ Patch0: polkit-0.97-subject-scanning.patch
++# Upstream fix
++Patch1: 0001-Fix-ConsoleKit-interaction-bug.patch
++
+ 
  %description
  PolicyKit is a toolkit for defining and handling authorizations.
  It is used for allowing unprivileged processes to speak to privileged
@@@ -64,7 -69,7 +71,8 @@@ Roles and default policy for desktop us
  
  %prep
  %setup -q
- %patch0 -p1 -b .ck-interaction
+ %patch0 -p1 -b .subject-scanning
++%patch1 -p1 -b .ck-interaction
  
  %build
  %configure --enable-gtk-doc --disable-static --libexecdir=%{_libexecdir}/polkit-1 --disable-introspection --enable-examples
@@@ -182,9 -191,12 +190,15 @@@ EO
  %{_datadir}/gtk-doc/html/*
  
  %changelog
- * Wed Aug 18 2010 Matthias Clasen <mclasen at redhat.com> - 0.97-3
++* Wed Aug 18 2010 Matthias Clasen <mclasen at redhat.com> - 0.97-4
 +- Fix a ConsoleKit interaction bug
 +
+ * Fri Aug 13 2010 David Zeuthen <davidz at redhat.com> - 0.97-3
+ - Add a patch to make pkcheck(1) work the way libvirtd uses it (#623257)
+ - Require GLib >= 2.25.12 instead of 2.25.11
+ - Ensure polkit-gnome packages earlier than 0.97 are not used with
+   these packages
+ 
  * Mon Aug 09 2010 David Zeuthen <davidz at redhat.com> - 0.97-2
  - Rebuild