[polkit-qt: 2/2] Merge branch 'f20'

[Martin Briza]

commit 2ad9f18472b6639a61fd16059cb8707d41319243
Merge: 664b905 be7c1de
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Jul 10 10:56:14 2014 +0200

    Merge branch 'f20'
    
    Conflicts:
    	polkit-qt.spec

 .gitignore                                         |    1 +
 ...FindGObject.cmake-with-the-one-in-kdelibs.patch |  132 --------------------
 0002-Normalize-connect-using-Qt-s-normalize.patch  |  116 -----------------
 0003-Fixed-reference-counting-of-GObjects.patch    |  105 ----------------
 ...GCancellable-handling-in-PolkitQtListener.patch |   47 -------
 polkit-qt.spec                                     |   21 ++--
 sources                                            |    3 +-
 7 files changed, 12 insertions(+), 413 deletions(-)
---
diff --cc polkit-qt.spec
index f983a19,fef1ff6..9c195ce
--- a/polkit-qt.spec
+++ b/polkit-qt.spec
@@@ -2,8 -2,8 +2,10 @@@
  %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
  
  Name:            polkit-qt
 +Version:         0.103.0
 +Release:         11%{?dist}
+ Version:         0.112.0
+ Release:         1%{?dist}
  Summary:         Qt bindings for PolicyKit
  
  License:         GPLv2+
@@@ -112,8 -104,8 +106,13 @@@ install -p -m644 -D %{SOURCE10} %{build
  
  
  %changelog
++<<<<<<< HEAD
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.103.0-11
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
++=======
+ * Thu Jul 10 2014 Martin Bříza <mbriza at redhat.com> - 0.112.0-1
+ - polkit-qt-1-0.112.0
++>>>>>>> f20
  
  * Sat Feb 01 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.103.0-10
  - -devel: use %%_rpmconfigdir/macros.d (where supported)