rpms/kdebase-workspace/devel kdebase-workspace-4.3.90-missing_include.patch, NONE, 1.1 kdebase-workspace.spec, 1.345, 1.346

Jaroslav Reznik jreznik at fedoraproject.org
Thu Jan 14 17:15:18 UTC 2010


Author: jreznik

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9264

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.90-missing_include.patch 
Log Message:
* Thu Jan 14 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.3.90-6
- fix KDM's missing header build problem
- polkit-qt BR for polkit-1


kdebase-workspace-4.3.90-missing_include.patch:
 ctrl.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdebase-workspace-4.3.90-missing_include.patch ---
diff -up kdebase-workspace-4.3.90/kdm/backend/ctrl.c.missing_include kdebase-workspace-4.3.90/kdm/backend/ctrl.c
--- kdebase-workspace-4.3.90/kdm/backend/ctrl.c.missing_include	2010-01-14 11:34:41.000000000 +0100
+++ kdebase-workspace-4.3.90/kdm/backend/ctrl.c	2010-01-14 11:34:37.000000000 +0100
@@ -42,6 +42,7 @@ from the copyright holder.
 #include <string.h>
 #include <signal.h>
 #include <pwd.h>
+#include <sys/stat.h>
 
 static void
 acceptSock( CtrlRec *cr )


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -p -r1.345 -r1.346
--- kdebase-workspace.spec	11 Jan 2010 18:01:29 -0000	1.345
+++ kdebase-workspace.spec	14 Jan 2010 17:15:18 -0000	1.346
@@ -20,7 +20,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.3.90
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -51,6 +51,8 @@ Patch17: kdebase-workspace-4.3.75-classi
 Patch19: kdebase-workspace-4.3.3-kdm_plymouth.patch
 Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
 Patch21: kdebase-workspace-4.3.85-no_malloc_check.patch
+# fixes KDM's build failure, should be upstreamed!
+Patch22: kdebase-workspace-4.3.90-missing_include.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -121,9 +123,7 @@ BuildRequires: lm_sensors-devel
 %endif
 BuildRequires: NetworkManager-devel
 BuildRequires: pam-devel
-%if 0%{?polkit_09}
 BuildRequires: polkit-qt-devel
-%endif
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
@@ -304,6 +304,7 @@ Requires: akonadi
 %endif
 %patch20 -p1 -b .xsession_errors_O_APPEND
 %patch21 -p1 -b .no_malloc_check
+%patch22 -p1 -b .missing_include
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -534,6 +535,10 @@ fi
 %exclude %{_kde4_libdir}/kde4/plasma_engine_akonadi.so
 %exclude %{_kde4_datadir}/kde4/services/plasma-engine-akonadi.desktop
 %endif
+%if 0%{?polkit_1}
+%{_datadir}/polkit-1/actions/org.kde.kcontrol.kcmclock.policy
+%{_datadir}/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
+%endif
 %if 0%{?polkit_09}
 %{_kde4_bindir}/kfontinst
 %{_kde4_bindir}/kfontview
@@ -657,6 +662,10 @@ fi
 
 
 %changelog
+* Thu Jan 14 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.3.90-6
+- fix KDM's missing header build problem
+- polkit-qt BR for polkit-1
+
 * Mon Jan 11 2010 Rex Dieter <rdieter at fedoraproject.org> 4.3.90-5
 - do not link calendar dataengine with Akonadi (kde#215150, rh#552473)
 - s/plasma-engine/plasma-dataengine/



More information about the scm-commits mailing list