Hello community, here is the log from the commit of package plasma-addons for openSUSE:12.1 checked in at 2011-10-27 19:59:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/plasma-addons (Old) and /work/SRC/openSUSE:12.1/.plasma-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-addons", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1/plasma-addons/plasma-addons.changes 2011-10-24 13:19:44.000000000 +0200 +++ /work/SRC/openSUSE:12.1/.plasma-addons.new/plasma-addons.changes 2011-10-28 17:13:30.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Oct 27 12:30:56 UTC 2011 - idon...@suse.com + +- Remove redundant COPTING file bnc#726121 + +------------------------------------------------------------------- +Mon Oct 24 11:44:47 UTC 2011 - sasc...@gmx.de + +- Moved contacts, events and lancelot plasmoids into new 'akonadi' and + 'lancelot' subpackages. Removes dependency on kdepim4 / akonadi from + the base package +- Set license to SPDX style (GPL-2.0+) +- Removed outdated %clean section + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.xCypUI/_old 2011-10-28 17:13:31.000000000 +0200 +++ /var/tmp/diff_new_pack.xCypUI/_new 2011-10-28 17:13:31.000000000 +0200 @@ -19,8 +19,8 @@ Name: plasma-addons Version: 4.7.2 -Release: 1 -License: GPLv2+ +Release: 0 +License: GPL-2.0+ Summary: Additional Plasma Widgets Url: http://www.kde.org/ Group: System/GUI/KDE @@ -38,7 +38,8 @@ BuildRequires: libqimageblitz-devel BuildRequires: marble-devel BuildRequires: python-qt4-devel -Requires: kdepim4-runtime +Recommends: plasma-addons-akonadi +Recommends: plasma-addons-lancelot Recommends: plasma-addons-marble Provides: extragear-plasma = 4.0.80 Obsoletes: extragear-plasma < 4.0.80 @@ -54,17 +55,16 @@ Requires(post): shared-mime-info Requires(postun): shared-mime-info %kde4_runtime_requires -%kde4_pimlibs_requires -%kde4_akonadi_requires %description Additional plasmoids from upstream for use on the KDE workspace %package devel -License: GPLv2+ Summary: Development files for %{name} Group: Development/Libraries/KDE Requires: plasma-addons = %{version} +Requires: plasma-addons-akonadi = %{version} +Requires: plasma-addons-lancelot = %{version} Provides: kde4-plasma-addons-devel = 4.2.96 Obsoletes: kde4-plasma-addons-devel < 4.2.96 @@ -72,8 +72,29 @@ Development files and headers needed to build software using %{name} +%package akonadi +Summary: Additional Plasmoids Depending on Akonadi +Group: System/GUI/KDE +Requires: kdepim4-runtime +%kde4_pimlibs_requires +%kde4_akonadi_requires +%kde4_runtime_requires + +%description akonadi +Additional plasmoids from upstream that require Akonadi + +%package lancelot +Summary: Additional Lancelot Launcher Plasmoid +Group: System/GUI/KDE +Requires: kdepim4-runtime +%kde4_pimlibs_requires +%kde4_akonadi_requires +%kde4_runtime_requires + +%description lancelot +Additional launcher plasmoid from upstream that requires Akonadi + %package marble -License: GPLv2+ Summary: Additional Plasmoids Depending on Marble Group: System/GUI/KDE Requires: marble = %{version} @@ -90,6 +111,10 @@ %patch1 %patch2 +# Remove reduntant COPYING file bnc#726121 +# Christian Weilbach <duns...@web.de> agreed to license this under GPLv2+ +rm applets/incomingmsg/COPYING + %build %cmake_kde4 -d build %make_jobs @@ -109,13 +134,18 @@ /sbin/ldconfig %{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +%post akonadi -p /sbin/ldconfig + +%postun akonadi -p /sbin/ldconfig + +%post lancelot -p /sbin/ldconfig + +%postun lancelot -p /sbin/ldconfig + %post marble -p /sbin/ldconfig %postun marble -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files devel %defattr(-,root,root) %dir %{_includedir}/lancelot-datamodels @@ -128,6 +158,29 @@ %{_kde4_libdir}/librtm.so %{_kde4_appsdir}/cmake/modules/FindLancelot* +%files akonadi +%defattr(-,root,root) +%doc COPYING +%{_kde4_modulesdir}/kcm_plasma_runner_events.so +%{_kde4_modulesdir}/krunner_contacts.so +%{_kde4_modulesdir}/plasma_runner_events.so +%{_kde4_servicesdir}/plasma-runner-contacts.desktop +%{_kde4_servicesdir}/plasma-runner-events*.desktop + +%files lancelot +%defattr(-,root,root) +%doc COPYING +%{_kde4_appsdir}/lancelot +%{_kde4_bindir}/lancelot +%{_kde4_modulesdir}/plasma_applet_lancelot*.so +%{_kde4_libdir}/liblancelot.so.* +%{_kde4_libdir}/liblancelot-datamodels.so.* +%{_kde4_iconsdir}/*/*/apps/lancelot*.png +%{_kde4_appsdir}/desktoptheme/*/lancelot +%{_kde4_servicesdir}/lancelot.desktop +%{_kde4_servicesdir}/plasma-applet-lancelot*.desktop +%{_datadir}/mime/packages/lancelotpart-mime.xml + %files marble %defattr(-,root,root) %doc COPYING @@ -137,31 +190,36 @@ %files %defattr(-,root,root) %doc COPYING -%{_datadir}/mime/packages/lancelotpart-mime.xml %dir %{_kde4_appsdir}/plasma-applet-opendesktop-activities %{_kde4_appsdir}/bball %{_kde4_appsdir}/desktoptheme/ -%{_kde4_appsdir}/lancelot +%exclude %{_kde4_appsdir}/desktoptheme/*/lancelot %{_kde4_appsdir}/plasma/services/ %{_kde4_appsdir}/plasma-applet-* %{_kde4_appsdir}/plasmaboard/ %{_kde4_appsdir}/plasma_pastebin %{_kde4_appsdir}/plasma_wallpaper_pattern %{_kde4_appsdir}/rssnow -%{_kde4_bindir}/lancelot %config %{_kde_config_dir}/*.knsrc %{_kde4_iconsdir}/*/*/apps/* -%{_kde4_libdir}/liblancelot.so.* -%{_kde4_libdir}/liblancelot-datamodels.so.* +%exclude %{_kde4_iconsdir}/*/*/apps/lancelot*.png %{_kde4_libdir}/libplasma*.so.* %{_kde4_libdir}/librtm.so.* %{_kde4_modulesdir}/kcm_*.so +%exclude %{_kde4_modulesdir}/kcm_plasma_runner_events.so %{_kde4_modulesdir}/krunner_*.so +%exclude %{_kde4_modulesdir}/krunner_contacts.so %{_kde4_modulesdir}/plasma_* +%exclude %{_kde4_modulesdir}/plasma_applet_lancelot*.so +%exclude %{_kde4_modulesdir}/plasma_runner_events.so %{_kde4_modulesdir}/plasma-applet_systemloadviewer.so %exclude %{_kde4_modulesdir}/plasma_wallpaper_marble.so %{_kde4_servicesdir}/* %{_kde4_servicetypes}/plasma_*.desktop +%exclude %{_kde4_servicesdir}/lancelot.desktop +%exclude %{_kde4_servicesdir}/plasma-runner-contacts.desktop +%exclude %{_kde4_servicesdir}/plasma-runner-events*.desktop +%exclude %{_kde4_servicesdir}/plasma-applet-lancelot*.desktop %exclude %{_kde4_servicesdir}/plasma-wallpaper-marble.desktop %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
