Resolve merge conflicts

polkit.spec

@@ -1,7 +1,7 @@
 Summary: PolicyKit Authorization Framework
 Name: polkit
 Version: 0.98
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -41,7 +41,6 @@ Summary: Development files for PolicyKit
 Group: Development/Libraries
 Requires: %name = %{version}-%{release}
 Requires: %name-docs = %{version}-%{release}
-Requires: pkgconfig
 Requires: glib2-devel
 Obsoletes: PolicyKit-devel <= 0.10
 Provides: PolicyKit-devel = 0.11
@@ -53,7 +52,6 @@ Development files for PolicyKit.
 Summary: Development documentation for PolicyKit
 Group: Development/Libraries
 Requires: %name-devel = %{version}-%{release}
-Requires: gtk-doc
 Obsoletes: PolicyKit-docs <= 0.10
 Provides: PolicyKit-docs = 0.11
 
@@ -192,9 +190,12 @@ EOF
 %{_datadir}/gtk-doc/html/*
 
 %changelog
-* Thu Sep 02 2010 David Zeuthen <davidz@redhat.com> - 0.98-2
+* Thu Sep 02 2010 David Zeuthen <davidz@redhat.com> - 0.98-3
 - Include polkitagentenumtypes.h (#629515)
 
+* Mon Aug 23 2010 Matthias Clasen <mclasen@redhat.com> - 0.98-2
+- Co-own /usr/share/gtk-doc (#604410)
+
 * Fri Aug 20 2010 David Zeuthen <davidz@redhat.com> - 0.98-1
 - Update to upstream release 0.98