[polkit-qt: 2/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/polkit-qt

[Rex Dieter]

commit 66f81a1dcb079e55886690149b3417fc8075e61f
Merge: 4ee5cb4 09440d1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Nov 20 14:44:40 2010 -0600

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/polkit-qt
    
    Conflicts:
    	polkit-qt.spec
    	sources
    
    (Sorry, my first attempt at up'ing to 0.98.1 before fetching
    latest changes)

 polkit-qt-0.96.1-fix-deprecated-warnings.patch |   71 ++++++++++++++++++++++++
 polkit-qt-0.96.1-null-checking.patch           |   14 +++++
 polkit-qt.spec                                 |   16 ++++-
 3 files changed, 98 insertions(+), 3 deletions(-)
---
diff --cc polkit-qt.spec
index ad6054a,8afe7c6..99f511e
--- a/polkit-qt.spec
+++ b/polkit-qt.spec
@@@ -8,20 -5,17 +8,17 @@@ Summary:         Qt bindings for Policy
  
  Group:           System Environment/Libraries
  License:         GPLv2+
 -URL:             http://websvn.kde.org/trunk/kdesupport/polkit-qt-1/
 -
 -Source0:         ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/polkit-qt-1-%{version}.tar.bz2 
 +URL:             https://projects.kde.org/projects/kdesupport/polkit-qt-1 
 +%if 0%{?snap}
 +Source0:         polkit-qt-1-%{version}-%{snap}.tar.bz2
 +%else
 +Source0:         ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admim/polkit-qt-1-%{version}.tar.bz2 
 +%endif
  Source1:         Doxyfile
 +BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
- 
  Patch0:          polkit-qt-0.95.1-install-cmake-find.patch
 -Patch1:          polkit-qt-0.96.1-fix-deprecated-warnings.patch
 -Patch2:          polkit-qt-0.96.1-null-checking.patch
 -
 -BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
- BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
  Source10: macros.polkit-qt
  
  BuildRequires:   automoc4
@@@ -63,6 -57,12 +60,7 @@@ BuildArch: noarc
  # module installation
  %patch0 -p1 -b .install-cmake-find
  
 -# NULL checking
 -%patch2 -p0
 -
 -# Fix deprecation warning with polkit-0.98, second try
 -%patch1 -p1
+ 
  %build
  mkdir -p %{_target_platform}
  pushd %{_target_platform}
@@@ -81,6 -81,6 +79,7 @@@ rm -rf %{buildroot
  make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
  install -p -m644 -D %{SOURCE10} %{buildroot}%{_sysconfdir}/rpm/macros.polkit-qt
  
++
  %clean
  rm -rf %{buildroot}
  
@@@ -115,9 -115,17 +114,20 @@@
  %doc html/*
  
  %changelog
 +* Sat Nov 20 2010 Rex Dieter <rdieter at fedoraproject.org> -  0.98.1-1.20101120
 +- polkit-qt-1-0.98.1-20101120 snapshot
 +
+ * Fri Oct 15 2010 Radek Novacek <rnovacek at redhat.com> - 0.96.1-4
+ - Next attempt of fix-deprecated-warnings patch
+ 
+ * Thu Oct 14 2010 Jaroslav Reznik <jreznik at redhat.com> - 0.96.1-3
+ - Revert fix-deprecated-warnings as it causes kde#254150
+ 
+ * Thu Oct 07 2010 Radek Novacek <rnovacek at redhat.com> 0.96.1-2
+ - Fixed deprecation warning with polkit-0.98
+ - Fixed typo in url
+ - Null checking patch (might be fix for #637064)
+ 
  * Tue Sep 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.96.1-1
  - polkit-qt-1-0.96.1