rpms/kdelibs/F-10 plasma-on-screensaver-security-fix.diff, NONE, 1.1 kdelibs.spec, 1.396, 1.397

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16035

Modified Files:
	kdelibs.spec 
Added Files:
	plasma-on-screensaver-security-fix.diff 
Log Message:
* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
- plasma-on-screensaver-security patch
- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
- Requires: strigi-libs >= 0.6.3
- use %{?_isa} to avoid potential multilib heartbreak


plasma-on-screensaver-security-fix.diff:

--- NEW FILE plasma-on-screensaver-security-fix.diff ---
Index: containment.cpp
===================================================================
--- containment.cpp	(revision 916284)
+++ containment.cpp	(working copy)
@@ -1602,12 +1602,10 @@
         }
 
         bool canConfig = unlocked || KAuthorized::authorize("PlasmaAllowConfigureWhenLocked");
-        if (canConfig) {
-            action = actions().action("activity settings");
-            if (action) {
-                action->setVisible(canConfig);
-                action->setEnabled(canConfig);
-            }
+        action = actions().action("activity settings");
+        if (action) {
+            action->setVisible(canConfig);
+            action->setEnabled(canConfig);
         }
 
         // tell the applets too


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- kdelibs.spec	23 Jan 2009 18:59:58 -0000	1.396
+++ kdelibs.spec	26 Jan 2009 18:10:28 -0000	1.397
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -44,8 +44,9 @@
 %if 0%{?fedora} >= 9
 Requires: hunspell
 %endif
-Requires: phonon >= 4.2.96
-Requires: soprano >= 2.1.64
+Requires: phonon%{?_isa} >= 4.3.0
+Requires: soprano%{?_isa} >= 2.1.64
+Requires: strigi-libs%{?_isa} >= 0.6.3
 
 Source1: kde4.sh
 Source2: kde4.csh
@@ -79,11 +80,12 @@
 Patch22: kdelibs-4.1.96-cmake.patch
 
 # upstream
+Patch100: plasma-on-screensaver-security-fix.diff
 # 4.3 branch
 Patch101: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
-Requires: qt4 >= %{_qt4_version}
+Requires: qt4%{?_isa} >= %{_qt4_version}
 Requires: xdg-utils
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
@@ -93,7 +95,7 @@
 # we don't want a hard dependency on aspell on F9+, use enchant only
 BuildRequires: aspell-devel
 %endif
-BuildRequires: automoc
+BuildRequires: automoc4 >= 0.9.88
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
 BuildRequires: cmake >= 2.6.2-3
@@ -114,7 +116,7 @@
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
-BuildRequires: phonon-devel >= 4.2.96
+BuildRequires: phonon-devel >= 4.3.0
 BuildRequires: shared-mime-info
 BuildRequires: soprano-devel >= 2.1.64
 BuildRequires: strigi-devel >= 0.6.3
@@ -153,11 +155,11 @@
 Provides:  kdelibs4-devel = %{version}-%{release}
 %endif
 Requires: cmake >= 2.6.2-3
-Requires: automoc
+Requires: automoc4 >= 0.9.88
 Requires: qt4-devel
 Requires: openssl-devel
-Requires: phonon-devel >= 4.2.96
-Requires: strigi-devel >= 0.6.3
+Requires: phonon-devel
+Requires: strigi-devel
 Requires: bzip2-devel gamin-devel libacl-devel zlib-devel libutempter-devel
 %{?x_deps:Requires: %{x_deps}}
 %description devel
@@ -207,6 +209,9 @@
 %patch22 -p1 -b .kdepimlibs-cmake
 
 # upstream patches
+pushd plasma
+%patch100 -p0 -b .plasma-on-screensaver-security-fix
+popd
 %patch101 -p1 -b .AllowExternalPaths
 
 %build
@@ -369,6 +374,12 @@
 
 
 %changelog
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-2
+- plasma-on-screensaver-security patch
+- (Build)Req: automoc4 >= 0.9.88, phonon(-devel) >= 4.3.0
+- Requires: strigi-libs >= 0.6.3
+- use %%{?_isa} to avoid potential multilib heartbreak
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0