rpms/kdebase-workspace/devel kdebase-workspace-4.1.80-show-systemsettings.patch, NONE, 1.1 kdebase-workspace.spec, 1.134, 1.135 kdebase-workspace-4.1.1-show-systemsettings.patch, 1.1, NONE

[Lorenzo Villani]

Author: arbiter

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.80-show-systemsettings.patch 
Removed Files:
	kdebase-workspace-4.1.1-show-systemsettings.patch 
Log Message:
- fix build

kdebase-workspace-4.1.80-show-systemsettings.patch:

--- NEW FILE kdebase-workspace-4.1.80-show-systemsettings.patch ---
diff -Naur kdebase-workspace-4.1.80/plasma/applets/kickoff/core/applicationmodel.cpp kdebase-workspace-4.1.80.show-systemsettings/plasma/applets/kickoff/core/applicationmodel.cpp
--- kdebase-workspace-4.1.80/plasma/applets/kickoff/core/applicationmodel.cpp	2008-11-17 02:34:37.000000000 +0100
+++ kdebase-workspace-4.1.80.show-systemsettings/plasma/applets/kickoff/core/applicationmodel.cpp	2008-11-23 19:44:41.000000000 +0100
@@ -98,7 +98,6 @@
             systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy),
             sortOrder(Qt::AscendingOrder),
             sortColumn(Qt::DisplayRole) {
-        systemApplications = Kickoff::systemApplicationList();
     }
 
     ~ApplicationModelPrivate() {
diff -Naur kdebase-workspace-4.1.80/systemsettings/systemsettings.desktop kdebase-workspace-4.1.80.show-systemsettings/systemsettings/systemsettings.desktop
--- kdebase-workspace-4.1.80/systemsettings/systemsettings.desktop	2008-09-29 13:19:40.000000000 +0200
+++ kdebase-workspace-4.1.80.show-systemsettings/systemsettings/systemsettings.desktop	2008-11-23 19:43:36.000000000 +0100
@@ -142,3 +142,4 @@
 
 X-DBUS-StartupType=Unique
 Categories=Qt;KDE;System;
+OnlyShowIn=KDE;


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- kdebase-workspace.spec	20 Nov 2008 11:23:46 -0000	1.134
+++ kdebase-workspace.spec	23 Nov 2008 20:08:56 -0000	1.135
@@ -1,8 +1,10 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.1.80
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -11,7 +13,7 @@
 
 Patch1: kdebase-workspace-4.1.72-redhat-startkde.patch
 Patch2: kdebase-workspace-4.1.72-plasma-konsole.patch
-Patch3: kdebase-workspace-4.1.1-show-systemsettings.patch
+Patch3: kdebase-workspace-4.1.80-show-systemsettings.patch
 Patch4: kdebase-workspace-4.0.72-ck-shutdown.patch
 #Â 434824: KDE4 System Settings - No Method To Enter Administrative Mode
 Patch5: kdebase-workspace-4.1.2-rootprivs.patch
@@ -201,6 +203,8 @@
 for i in lib*.so
 do
   case "$i" in
+    libkephal.so)
+      ;;
     libplasma_applet-system-monitor.so)
       ;;
     libkdeinit*.so)
@@ -265,6 +269,7 @@
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kconf_update_bin/*
+%{python_sitelib}/PyKDE4/plasmascript.py*
 
 %files libs
 %defattr(-,root,root,-)
@@ -272,11 +277,14 @@
 
 %files devel
 %defattr(-,root,root,-)
+%dir %{_includedir}/kephal
+%{_includedir}/kephal
 %{_kde4_includedir}/*
 %{_kde4_libdir}/lib*.so
 %{_kde4_libdir}/kde4/devel/lib*.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardwidgets.so
 %{_kde4_libdir}/kde4/plugins/designer/ksysguardlsofwidgets.so
+%{_kde4_datadir}/apps/cmake/modules/FindKephal.cmake
 %exclude %{_kde4_libdir}/libkdeinit*.so
 
 %files wallpapers
@@ -303,6 +311,10 @@
 
 
 %changelog
+* Sun Nov 23 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-3
+- rebase kdebase-workspace-4.1.1-show-systemsettings.patch
+- new library: Kephal -> adapt file lists
+
 * Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
 - merged
 - drop kdebase-workspace-4.1.2-kdm-i18n.patch, it's included in upstream


--- kdebase-workspace-4.1.1-show-systemsettings.patch DELETED ---