rpms/kdebase-workspace/devel kdebase-workspace-4.2.0-pykde4.patch, NONE, 1.1 kdebase-workspace.spec, 1.184, 1.185

Than Ngo than at fedoraproject.org
Wed Feb 18 15:35:36 UTC 2009


Author: than

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

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.0-pykde4.patch 
Log Message:
- drop the BR on PyKDE4, it's just needed for runtime
- python-applet subpackage



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/devel/kdebase-workspace.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- kdebase-workspace.spec	17 Feb 2009 15:04:24 -0000	1.184
+++ kdebase-workspace.spec	18 Feb 2009 15:35:05 -0000	1.185
@@ -8,7 +8,7 @@
 Name: kdebase-workspace
 Version: 4.2.0
 
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -28,6 +28,7 @@
 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-pykde4.patch
 
 # upstream patches:
 # trunk
@@ -58,9 +59,6 @@
 Requires: kdebase4
 %endif
 
-# for plasmascript bits
-Requires: PyKDE4 >= %{version}
-
 # kdmtheme's functionality is now provided by kdebase-workspace itself
 Obsoletes: kdmtheme < 1.3
 
@@ -85,7 +83,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
@@ -187,6 +184,13 @@
 %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
 
@@ -207,6 +211,7 @@
 %patch9 -p1 -b .session-button
 %patch11 -p1 -b .font
 %patch12 -p1 -b .default_applets
+%patch13 -p1 -b .pykde4
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
@@ -296,12 +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,-)
@@ -354,7 +362,17 @@
 %{_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
+* 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
 




More information about the fedora-extras-commits mailing list