* Thu Dec 03 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.80-2
- BR polkit-qt-devel - fix the build of the KAuth PolkitQt-1 backend (upstream patch)
This commit is contained in:
parent
b1d103f658
commit
89037a6dd7
|
@ -0,0 +1,13 @@
|
||||||
|
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)
|
18
kdelibs.spec
18
kdelibs.spec
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
Summary: K Desktop Environment 4 - Libraries
|
Summary: K Desktop Environment 4 - Libraries
|
||||||
Version: 4.3.80
|
Version: 4.3.80
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
|
@ -87,6 +87,8 @@ Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
|
||||||
Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff
|
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)
|
# Backport fix, needed for kdeedu (kde-packager list)
|
||||||
Patch100: kdelibs-4.3.80-findqt4-typo.patch
|
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
|
# security fix
|
||||||
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
||||||
|
@ -120,8 +122,7 @@ BuildRequires: OpenEXR-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: phonon-devel >= %{phonon_ver}
|
BuildRequires: phonon-devel >= %{phonon_ver}
|
||||||
# TODO: polkit-qt dependency
|
BuildRequires: polkit-qt-devel
|
||||||
#BuildRequires: polkit-qt-devel >= %{polkit_qt_ver}
|
|
||||||
BuildRequires: qca2-devel
|
BuildRequires: qca2-devel
|
||||||
BuildRequires: shared-mime-info
|
BuildRequires: shared-mime-info
|
||||||
BuildRequires: soprano-devel >= %{soprano_ver}
|
BuildRequires: soprano-devel >= %{soprano_ver}
|
||||||
|
@ -215,10 +216,13 @@ format for easy browsing.
|
||||||
%patch24 -p1 -b .drkonq
|
%patch24 -p1 -b .drkonq
|
||||||
%endif
|
%endif
|
||||||
%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
|
%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
|
||||||
%patch100 -p0 -b findqt4-typo
|
|
||||||
|
# Kubuntu patch
|
||||||
|
%patch50 -p1 -b .kaction_qt_keys
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch50 -p1 -b .kaction_qt_keys
|
%patch100 -p0 -b .findqt4-typo
|
||||||
|
%patch101 -p0 -b .kauth-polkitqt-1
|
||||||
|
|
||||||
# security fix
|
# security fix
|
||||||
%patch200 -p1 -b .CVE-2009-2702
|
%patch200 -p1 -b .CVE-2009-2702
|
||||||
|
@ -413,6 +417,10 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 03 2009 Kevin Kofler <Kevin@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@gmail.com> - 4.3.80-1
|
* Tue Dec 01 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.80-1
|
||||||
- KDE 4.4 beta1 (4.3.80)
|
- KDE 4.4 beta1 (4.3.80)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue