rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.0-pykde4.patch, NONE, 1.1 kdebase-workspace.spec, 1.134, 1.135 sources, 1.20, 1.21 kdebase-workspace-4.2.0-kde#181199.patch, 1.1, NONE kdebase-workspace-4.2.0-kdm-qt45.patch, 1.1, NONE

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8671/F-9

Modified Files:
	kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.2.0-pykde4.patch 
Removed Files:
	kdebase-workspace-4.2.0-kde#181199.patch 
	kdebase-workspace-4.2.0-kdm-qt45.patch 
Log Message:
KDE 4.2.1 (sync patches with devel)


kdebase-workspace-4.2.0-pykde4.patch:

--- NEW FILE kdebase-workspace-4.2.0-pykde4.patch ---
diff -up kdebase-workspace-4.2.0/CMakeLists.txt.orig kdebase-workspace-4.2.0/CMakeLists.txt
--- kdebase-workspace-4.2.0/CMakeLists.txt.orig	2009-02-18 15:47:51.000000000 +0100
+++ kdebase-workspace-4.2.0/CMakeLists.txt	2009-02-18 15:50:34.000000000 +0100
@@ -59,9 +59,9 @@ endif(PYQT4_FOUND AND PYQT4_VERSION STRL
 
 macro_optional_find_package(PyKDE4)
 set(PythonSupport_FOUND FALSE)
-if(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+if(PYTHONLIBRARY_FOUND)
   set(PythonSupport_FOUND TRUE)
-endif(PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4_FOUND AND PYKDE4_FOUND)
+endif(PYTHONLIBRARY_FOUND)
 
 macro_log_feature(PythonSupport_FOUND "Python" "KDE Python support" "http://techbase.kde.org/Development/Languages/Python" FALSE "" "Needed to build plasma scriptengine for Python")
 #### End Python support ####


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- kdebase-workspace.spec	27 Feb 2009 12:22:40 -0000	1.134
+++ kdebase-workspace.spec	27 Feb 2009 16:14:34 -0000	1.135
@@ -6,9 +6,9 @@
 
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
-Version: 4.2.0
+Version: 4.2.1
 
-Release: 12%{?dist}
+Release: 1%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -28,8 +28,9 @@
 Patch9: kdebase-workspace-4.1.80-session-button.patch
 Patch11: kdebase-workspace-4.1.96-font.patch
 Patch12: kdebase-workspace-4.2.0-default_applets.patch
-Patch13: kdebase-workspace-4.2.0-klipper-arora.patch
-Patch14: kdebase-workspace-4.2.0-kio_sysinfo.patch
+Patch13: kdebase-workspace-4.2.0-pykde4.patch
+Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
+Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
 
 # upstream patches:
 # trunk
@@ -39,18 +40,12 @@
 # revert solid-bluetooth to the version from 4.1.4, needed for kdebluetooth 0.2
 # 0.3 requires BlueZ 4 and the patch above
 Patch102: kdebase-workspace-4.2.0-bluetooth-revert.patch
-# http://bugs.kde.org/180576
+# from 4.3: http://bugs.kde.org/180576
 Patch103: kdebase-workspace-4.2.0-kde#180576.patch
-Patch104: kdebase-workspace-4.2.0-kdm-qt45.patch
-# http://bugs.kde.org/show_bug.cgi?id=181199
-# http://websvn.kde.org/?view=rev&revision=915366
-# fix shutdown dialog not centered, sometimes entirely off screen (from 4.2.1)
-Patch105: kdebase-workspace-4.2.0-kde#181199.patch
-
-# FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
 
 Provides: kdebase-kdm = 6:%{version}-%{release}
 Provides: kdm = %{version}-%{release}
+Provides: service(graphical-login) = kdm
 
 # FIXME: Should we restore this now that kdebase no longer depends on kdebase-workspace?
 %if 0%{?fedora} == 9
@@ -60,9 +55,6 @@
 Requires: kdebase4
 %endif
 
-# for plasmascript bits
-Requires: PyKDE4 >= %{version}
-
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 
@@ -87,7 +79,6 @@
 BuildRequires: qimageblitz-devel
 BuildRequires: soprano-devel
 BuildRequires: python-devel
-BuildRequires: PyKDE4-devel >= %{version}
 BuildRequires: qedje-devel
 # used for the Logitech mouse KCM, disabled until #399931 is fixed
 # BuildRequires: libusb-devel
@@ -101,7 +92,7 @@
 # would much rather these deps be elsewhere,
 # but adding here doesn't hurt either -- Rex
 Requires: kdebase-runtime >= %{version}
-Requires: oxygen-icon-theme
+Requires: oxygen-icon-theme >= %{version}
 
 # split ksysguardd
 Requires: ksysguardd = %{version}-%{release}
@@ -184,7 +175,20 @@
 %description -n oxygen-cursor-themes
 %{summary}.
 
+%package googlegadgets
+Summary: Google Desktop Gadgets
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+%description googlegadgets
+%{summary}.
 
+%package python-applet
+Summary: Plasma widget in Python
+Group: User Interface/Desktops
+Requires: %{name} = %{version}-%{release}
+Requires: PyKDE4 >= %{version}
+%description python-applet
+%{summary}.
 
 %prep
 
@@ -205,10 +209,10 @@
 %patch9 -p1 -b .session-button
 %patch11 -p1 -b .font
 %patch12 -p1 -b .default_applets
-%patch13 -p1 -b .klipper-arora
+%patch13 -p1 -b .pykde4
+%patch14 -p1 -b .klipper-arora
 # kio_sysinfo based on OpenSUSE's patch
-%patch14 -p1 -b .kio_sysinfo
-
+%patch15 -p1 -b .kio_sysinfo
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
@@ -218,8 +222,6 @@
 %patch101 -p0 -b .solid-bluetoothTrunkTo42
 %endif
 %patch103 -p1 -b .kde#180576
-%patch104 -p1 -b .kdm-qt45
-%patch105 -p0 -b .kde#181199
 
 %build
 
@@ -232,6 +234,7 @@
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
+#  -k || make -C %{_target_platform}
 
 
 %install
@@ -298,7 +301,15 @@
 %{_libdir}/strigi/
 %{_kde4_libdir}/libkdeinit*.so
 %{_kde4_libdir}/kconf_update_bin/*
-%{python_sitearch}/PyKDE4/plasmascript.py*
+# googlegadgets
+%exclude %{_kde4_libdir}/kde4/plasma_package_ggl.so
+%exclude %{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
+%exclude %{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
+%exclude %{_kde4_datadir}/kde4/services/plasma-applet-ggl*
+%exclude %{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+# python widget
+%exclude %{_kde4_appsdir}/plasma_scriptengine_python
+%exclude %{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
 
 %files libs
 %defattr(-,root,root,-)
@@ -343,14 +354,47 @@
 %{_kde4_iconsdir}/Oxygen_Zion/
 %{_kde4_iconsdir}/Oxygen_Zion_Big/
 
+%files googlegadgets
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plasma_package_ggl.so
+%{_kde4_libdir}/kde4/plasma_scriptengine_ggl.so
+%{_kde4_datadir}/kde4/apps/plasma/plasmoids/ggl_*
+%{_kde4_datadir}/kde4/services/plasma-applet-ggl*
+%{_kde4_datadir}/kde4/services/*googlegadgets.desktop
+
+%files python-applet
+%defattr(-,root,root,-)
+%{python_sitearch}/PyKDE4/plasmascript.py*
+%{_kde4_appsdir}/plasma_scriptengine_python
+%{_kde4_datadir}/kde4/services/plasma-scriptengine*python.desktop
+
 
 %changelog
-* Fri Feb 27 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-12
+* Fri Feb 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.1-1
+- 4.2.1
+
+* Thu Feb 26 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-17
 - kio_sysinfo kick-off integration
 
-* Tue Feb 24 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-11
+* Tue Feb 24 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.2.0-16
 - no klipper action on selection for Arora browser
 
+* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-15
+- Provides: service(graphical-login) = kdm
+
+* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-14
+- Requires: oxygen-icon-theme >= %%version
+
+* Thu Feb 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.0-13
+- dpms issues (kdebug#177123)
+
+* Wed Feb 18 2009 Than Ngo <than at redhat.com> - 4.2.0-12
+- drop the BR on PyKDE4, it's just needed for runtime
+- python-applet subpackage
+
+* Tue Feb 17 2009 Than Ngo <than at redhat.com> - 4.2.0-11
+- googlegadgets subpackage
+
 * Mon Feb 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.0-10
 - fix shutdown dialog not centered, sometimes entirely off screen (kde#181199)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	27 Jan 2009 16:29:50 -0000	1.20
+++ sources	27 Feb 2009 16:14:34 -0000	1.21
@@ -1 +1 @@
-193e30b9ed0b55b0196289d9df43a904  kdebase-workspace-4.2.0.tar.bz2
+629463e9dcf55ea53225ae252c72783d  kdebase-workspace-4.2.1.tar.bz2


--- kdebase-workspace-4.2.0-kde#181199.patch DELETED ---


--- kdebase-workspace-4.2.0-kdm-qt45.patch DELETED ---