rpms/kdebase-runtime/F-11 .cvsignore, 1.37, 1.38 kdebase-runtime.spec, 1.130, 1.131

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10522

Modified Files:
	.cvsignore kdebase-runtime.spec 
Log Message:
* Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-3
- backport upstream kded/cpuhog patch (kde#202744)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- .cvsignore	9 Nov 2009 13:19:29 -0000	1.37
+++ .cvsignore	22 Jan 2010 14:11:19 -0000	1.38
@@ -1 +1,2 @@
 kdebase-runtime-4.3.3.tar.bz2
+kdebase-runtime-4.3.4.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-11/kdebase-runtime.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -p -r1.130 -r1.131
--- kdebase-runtime.spec	11 Dec 2009 18:58:10 -0000	1.130
+++ kdebase-runtime.spec	22 Jan 2010 14:11:19 -0000	1.131
@@ -1,15 +1,15 @@
 
 %if 0%{?fedora}
 %define flags 1
-%if 0%{?fedora} > 10
+#if 0%{?fedora} > 11
 %define phonon_pa_patch 1
-%endif
+#endif
 %endif
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime
 Version:       4.3.4
-Release:       2%{?dist}.1
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -32,6 +32,9 @@ Patch6:        kdebase-runtime-4.3.3-hom
 Patch7:        kdebase-runtime-4.3.1-backend-globalconfig.patch
 
 ## Upstream patches
+## http://bugs.kde.org/202744, based on:
+## http://websvn.kde.org/branches/KDE/4.4/kdebase/runtime/phonon/kded-module/hardwaredatabase.cpp?r1=1070858&r2=1075552&pathrev=1075552&view=patch
+Patch100: kdebase-runtime-4.3.4-kde#202744.patch
 
 # when kdesu was removed, this is/should-be only temporary
 %if 0%{?fedora} && 0%{?fedora} < 11
@@ -127,6 +130,8 @@ BuildArch: noarch
 #patch5 -p1 -b .manpath
 %patch6 -p1 -b .home_onlyshowin_kde
 
+%patch100 -p1 -b .kde#202744
+
 
 %build
 mkdir -p %{_target_platform}
@@ -243,6 +248,9 @@ fi
 
 
 %changelog
+* Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-3
+- backport upstream kded/cpuhog patch (kde#202744)
+
 * Fri Dec 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.4-2.1
 - enable phonon/pa patch on f11 too