Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2011-12-20 14:30:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2011-12-08 11:51:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2011-12-20 14:30:11.000000000 +0100 @@ -1,0 +2,15 @@ +Mon Dec 12 09:59:29 UTC 2011 - saschpe@suse.de + +- Use supplements packageand instead of recommends +- Added split provides + +------------------------------------------------------------------- +Wed Dec 7 14:18:37 UTC 2011 - saschpe@suse.de + + +- New subpackages plasma-engine-akonadi and plasma-calendar: + * Removed %kde4_akonadi_requires from base package, otherwise + half of KDE depends on akonadi-runtime. + * Both are recommended by base package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.MEBO3F/_old 2011-12-20 14:30:18.000000000 +0100 +++ /var/tmp/diff_new_pack.MEBO3F/_new 2011-12-20 14:30:18.000000000 +0100 @@ -141,7 +141,6 @@ Provides: kdeaccessibility = %{version} Obsoletes: kdeaccessibility < %{version} %kde4_pimlibs_requires -%kde4_akonadi_requires %kde4_runtime_requires %define _dminitdir %{_kde4_prefix}/lib/X11/displaymanagers @@ -269,6 +268,29 @@ %description liboxygenstyle This package contains the libraries of the oxygen style. +%package plasma-engine-akonadi +Summary: The Akonadi Plasma engine +Group: System/GUI/KDE +Supplements: packageand(akonadi-runtime:kdebase4-workspace) +Provides: kdebase4-workspace:%{_libdir}/kde4/plasma_engine_akonadi.so +Requires: %{name} = %{version} +%kde4_akonadi_requires +%kde4_pimlibs_requires + +%description plasma-engine-akonadi +This packages contains the Akonadi Plasma engine. + +%package plasma-calendar +Summary: The calendar Plasma engine and applet +Group: System/GUI/KDE +Supplements: packageand(akonadi-runtime:kdebase4-workspace) +Provides: kdebase4-workspace:%{_libdir}/kde4/plasma_engine_calendar.so +Requires: %{name} = %{version} +%kde4_akonadi_requires + +%description plasma-calendar +This packages contains the calendar Plasma engine and applet, which are based on Akonadi. + %prep %setup -q -n kde-workspace-%{version} %patch0 -p1 @@ -495,6 +517,16 @@ %dir %{_kde4_modulesdir}/plugins/styles %{_kde4_modulesdir}/plugins/styles/oxygen.so +%files plasma-engine-akonadi +%defattr(-,root,root) +%{_kde4_modulesdir}/plasma_engine_akonadi.so +%{_kde4_servicesdir}/plasma-engine-akonadi.desktop + +%files plasma-calendar +%defattr(-,root,root) +%{_kde4_modulesdir}/plasma_*_calendar.so +%{_kde4_servicesdir}/plasma-*-calendar.desktop + %files devel -f filelists/devel %defattr(-,root,root) %doc COPYING COPYING.DOC README @@ -601,10 +633,14 @@ %exclude %{_kde4_libdir}/libweather_ion.so %exclude %{_kde4_modulesdir}/kcm_kdm.so %exclude %{_kde4_modulesdir}/kgreet_*.so +%exclude %{_kde4_modulesdir}/plasma_*_calendar.so +%exclude %{_kde4_modulesdir}/plasma_engine_akonadi.so %exclude %{_kde4_modulesdir}/plugins/designer/ksysguardlsofwidgets.so %exclude %{_kde4_modulesdir}/plugins/styles %exclude %{_kde4_modulesdir}/plugins/styles/oxygen.so %exclude %{_kde4_servicesdir}/kwin +%exclude %{_kde4_servicesdir}/plasma-*-calendar.desktop +%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 %if 0%{?suse_version} > 1140 ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.MEBO3F/_old 2011-12-20 14:30:18.000000000 +0100 +++ /var/tmp/diff_new_pack.MEBO3F/_new 2011-12-20 14:30:18.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-kdebase4 Version: 4.7.4 Release: 0 @@ -34,8 +35,8 @@ BuildRequires: libqimageblitz-devel BuildRequires: libsmbclient-devel BuildRequires: libusb-devel -BuildRequires: pkgconfig(libxklavier) BuildRequires: python-kde4-devel +BuildRequires: pkgconfig(libxklavier) Requires: python-kde4 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org