Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2012-10-07 19:07:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2012-09-16 23:47:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2012-10-07 19:07:32.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Oct 1 11:00:49 UTC 2012 - [email protected] + +- removed kde3 parts from /usr/lib/X11/displaymanagers/kdm + (bnc#775548) + +------------------------------------------------------------------- +Mon Oct 1 08:12:48 UTC 2012 - [email protected] + +- Combine python-kdebase4 and kdebase4-workspace in a single + spec-file. Python-kdebase4 no longer needs python-devel files to + build. + +------------------------------------------------------------------- +Sat Sep 29 09:53:49 UTC 2012 - [email protected] + +- Update to 4.9.2 + * see http://kde.org/announcements/4.9.2/ for details + +------------------------------------------------------------------- Old: ---- disable-python-support.diff kde-workspace-4.9.1.tar.xz pre_checkin.sh python-kdebase4.changes python-kdebase4.spec New: ---- kde-workspace-4.9.2.tar.xz upstream-python-applets.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.kBWOj7/_old 2012-10-07 19:07:34.000000000 +0200 +++ /var/tmp/diff_new_pack.kBWOj7/_new 2012-10-07 19:07:34.000000000 +0200 @@ -19,7 +19,7 @@ %define with_systemd 0 Name: kdebase4-workspace -Version: 4.9.1 +Version: 4.9.2 Release: 0 Summary: The KDE Workspace Components License: GPL-2.0+ @@ -101,10 +101,11 @@ Patch126: dont-install-solid-netbackends.diff Patch201: plasma-notifications-kill-timer.diff Patch202: plasma-disable-networkmanager.diff -Patch211: disable-python-support.diff # PATCH-FIX-OPENSUSE kdm_systemd_shutdown.patch Avoid the situation where systemd would kill KDM # which prevents reboot/shutdown (Fedora Patch) Patch213: kdm_systemd_shutdown.patch +# PATCH-FIX-UPSTREAM Make python applets work with Python2 again. +Patch214: upstream-python-applets.diff %if %{with_systemd} # PATCH-FIX-OPENSUSE workspace_systemd_initial_support.patch # This patch rewrites the reboot/shutdown code within workspace so that it works with systemd. @@ -139,6 +140,7 @@ Requires: xmessage Requires: xprop %endif +Requires: kdebase4-artwork Recommends: kdebase4-SuSE Recommends: kwin Recommends: plasma-addons @@ -290,6 +292,7 @@ Requires: %{name} = %{version} %kde4_akonadi_requires %kde4_pimlibs_requires +%kde4_runtime_requires %description plasma-engine-akonadi This packages contains the Akonadi Plasma engine. @@ -298,12 +301,22 @@ Summary: The calendar Plasma engine and applet Group: System/GUI/KDE Provides: kdebase4-workspace:%_libdir/kde4/plasma_engine_calendar.so +Supplements: packageand(akonadi-runtime:kdebase4-workspace) Requires: %{name} = %{version} Recommends: akonadi-runtime %description plasma-calendar This packages contains the calendar Plasma engine and applet, which are based on Akonadi. +%package -n python-kdebase4 +Summary: Python bindings for KDE 4 desktop shell +Group: System/GUI/KDE +Requires: python-kde4 = %{version} + +%description -n python-kdebase4 +Python bindings for Plasma, the KDE 4 desktop shell. These bindings +allow Plasmoids written in Python + %prep %setup -q -n kde-workspace-%{version} %patch0 -p1 @@ -340,8 +353,8 @@ %patch126 -p1 %patch201 -p1 %patch202 -p1 -%patch211 %patch213 -p1 +%patch214 -p1 %if %{with_systemd} %patch214 -p1 %endif @@ -402,6 +415,14 @@ sed -i 's/^ForgingSeed=[0-9]\+/#ForgingSeed=1111122222/' %{buildroot}%{_kde4_configdir}/kdm/kdmrc mkdir -p %{buildroot}%{_dminitdir}/ cp %{SOURCE5} %{buildroot}%{_dminitdir}/ + + # Fix python-bytecode-inconsistent-mtime + for path in "%{buildroot}%{python_sitearch}" "%{buildroot}%_kde_share_dir/apps/plasma_scriptengine_python"; do + pushd "$path" + %py_compile . + popd + done + %fdupes -s %{buildroot} %kde_post_install @@ -565,6 +586,16 @@ %{_kde4_libdir}/libsystemsettingsview.so %{_kde4_libdir}/cmake/KDE4Workspace/ +%files -n python-kdebase4 +%defattr(-,root,root) +%doc COPYING README +%py_sitedir/PyKDE4 +%_kde_share_dir/apps/plasma_scriptengine_python +%_kde4_servicesdir/plasma-scriptengine-applet-python.desktop +%_kde4_servicesdir/plasma-scriptengine-dataengine-python.desktop +%_kde4_servicesdir/plasma-scriptengine-runner-python.desktop +%_kde4_servicesdir/plasma-scriptengine-wallpaper-python.desktop + %files -f filelists/exclude %defattr(-,root,root) #positives @@ -598,6 +629,7 @@ %config %{_kde4_sysconfdir}/dbus-1/system.d/org.kde.* #blacklist +%exclude %{_kde_share_dir}/apps/plasma_scriptengine_python %exclude %{_kde4_applicationsdir}/ksysguard.desktop %exclude %{_kde4_appsdir}/kwin/default_rules/plasma_desktop_containment.kwinrules %exclude %{_kde4_appsdir}/cmake @@ -656,6 +688,10 @@ %exclude %{_kde4_servicesdir}/plasma-engine-akonadi.desktop %exclude %{_kde4_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf %exclude %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-kdm +%exclude %{_kde4_servicesdir}/plasma-scriptengine-applet-python.desktop +%exclude %{_kde4_servicesdir}/plasma-scriptengine-dataengine-python.desktop +%exclude %{_kde4_servicesdir}/plasma-scriptengine-runner-python.desktop +%exclude %{_kde4_servicesdir}/plasma-scriptengine-wallpaper-python.desktop %if 0%{?suse_version} > 1140 %exclude %{_kde4_appsdir}/plasma-desktop/init %exclude %{_kde4_appsdir}/plasma-netbook/init ++++++ kdm ++++++ --- /var/tmp/diff_new_pack.kBWOj7/_old 2012-10-07 19:07:34.000000000 +0200 +++ /var/tmp/diff_new_pack.kBWOj7/_new 2012-10-07 19:07:34.000000000 +0200 @@ -5,22 +5,8 @@ kdm_vars() { KDM4_BIN=/usr/bin/kdm - KDM_BIN=/opt/kde3/bin/kdm case "${DISPLAYMANAGER##*/}" in - kdm3) - export KDEROOTHOME=/root/.kdm - DISPLAYMANAGER=$KDM_BIN - STARTPROC=kdm_start_proc - ;; - kdm|kde|KDM|KDE) - export KDEROOTHOME=/root/.kdm - DISPLAYMANAGER=$KDM_BIN - if [ ! -r "$DISPLAYMANAGER" ]; then - DISPLAYMANAGER=$KDM4_BIN - fi - STARTPROC=kdm_start_proc - ;; - kdm4) + kdm|kdm4|kde|KDM|KDE) export KDEROOTHOME=/root/.kdm DISPLAYMANAGER=$KDM4_BIN STARTPROC=kdm_start_proc ++++++ upstream-python-applets.diff ++++++ Git commit 92c79ebd767fd90eafa1e3865bfbbddcfa695c08 by Luca Beltrame. Committed on 01/10/2012 at 11:02. Pushed by lbeltrame into branch 'KDE/4.9'. Unbreak Python 2 applet loading. exec() is a function in Py3, but the syntax used in this file does not allow it for being called as a function in Python 2. Thus, a simple check is made, calling the right function depending on the Python version. It will likely not work with Python 3, but however applets are not supposed to in the first place. CCMAIL: [email protected] CCMAIL: [email protected] (cherry picked from commit 14f7b6a18ef8a81237df43551ee7bda122827d93) M +7 -1 plasma/generic/scriptengines/python/plasma_importer.py http://commits.kde.org/kde-workspace/92c79ebd767fd90eafa1e3865bfbbddcfa695c08 diff --git a/plasma/generic/scriptengines/python/plasma_importer.py b/plasma/generic/scriptengines/python/plasma_importer.py index 8d75f88..dae245a 100644 --- a/plasma/generic/scriptengines/python/plasma_importer.py +++ b/plasma/generic/scriptengines/python/plasma_importer.py @@ -22,6 +22,9 @@ import sys import os import imp +PY3 = sys.version_info[0] == 3 + + class PlasmaImporter(object): def __init__(self): self.toplevel = {} @@ -104,7 +107,10 @@ class PlasmaImporter(object): mod.__path__ = [self.marker] if code is not None: try: - exec (code in mod.__dict__) + if PY3: + exec(code in mod.__dict__) + else: + exec code in mod.__dict__ finally: code.close() return mod -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
