rpms/kdelibs/devel kdelibs-4.3.80-fix-kauth-polkitqt-1.patch, NONE, 1.1 kdelibs.spec, 1.544, 1.545

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14949/devel

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.3.80-fix-kauth-polkitqt-1.patch 
Log Message:
* Thu Dec 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
- BR polkit-qt-devel
- fix the build of the KAuth PolkitQt-1 backend (upstream patch)

kdelibs-4.3.80-fix-kauth-polkitqt-1.patch:
 ConfigureChecks.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.3.80-fix-kauth-polkitqt-1.patch ---
Index: kdecore/auth/ConfigureChecks.cmake
===================================================================
--- kdecore/auth/ConfigureChecks.cmake	(revision 1057409)
+++ kdecore/auth/ConfigureChecks.cmake	(revision 1057410)
@@ -20,7 +20,7 @@
             macro_optional_find_package(PolkitQt-1)
             
             if (POLKITQT-1_FOUND)
-                set (KAUTH_BACKEND "PolkitQt1")
+                set (KAUTH_BACKEND "PolkitQt-1")
                 macro_log_feature(POLKITQT-1_FOUND "PolkitQt-1" "Qt Wrapper around polkit-1" "http://techbase.kde.org/Polkit-Qt-1"
                                   FALSE "" "STRONGLY RECOMMENDED: Needed to make KAuth work (using polkit-1), hence to enable some workspace functionalities")
             else (POLKITQT-1_FOUND)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -p -r1.544 -r1.545
--- kdelibs.spec	3 Dec 2009 11:30:56 -0000	1.544
+++ kdelibs.spec	3 Dec 2009 13:36:24 -0000	1.545
@@ -8,7 +8,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -87,6 +87,8 @@ Patch26: kdelibs-4.3.3-khtml_svg_no_var_
 Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff
 # Backport fix, needed for kdeedu (kde-packager list)
 Patch100: kdelibs-4.3.80-findqt4-typo.patch
+# Another backported typo fix, this one for KAuth PolkitQt-1
+Patch101: kdelibs-4.3.80-fix-kauth-polkitqt-1.patch
 
 # security fix
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
@@ -120,8 +122,7 @@ BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
 BuildRequires: phonon-devel >= %{phonon_ver} 
-# TODO: polkit-qt dependency
-#BuildRequires: polkit-qt-devel >= %{polkit_qt_ver}
+BuildRequires: polkit-qt-devel
 BuildRequires: qca2-devel
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= %{soprano_ver} 
@@ -215,11 +216,14 @@ format for easy browsing.
 %patch24 -p1 -b .drkonq
 %endif
 %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
-%patch100 -p0 -b findqt4-typo
 
-# upstream patches
+# Kubuntu patch
 %patch50 -p1 -b .kaction_qt_keys
 
+# upstream patches
+%patch100 -p0 -b .findqt4-typo
+%patch101 -p0 -b .kauth-polkitqt-1
+
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
 
@@ -413,6 +417,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 03 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-2
+- BR polkit-qt-devel
+- fix the build of the KAuth PolkitQt-1 backend (upstream patch)
+
 * Tue Dec 01 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.80-1
 - KDE 4.4 beta1 (4.3.80)