Hello community, here is the log from the commit of package kdebase4-workspace checked in at Tue Oct 7 16:01:40 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-10-06 18:58:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-10-07 16:00:56.159969000 +0200 @@ -1,0 +2,5 @@ +Tue Oct 7 12:20:01 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + +------------------------------------------------------------------- kdebase4-workspace.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.M24972/_old 2008-10-07 16:01:14.000000000 +0200 +++ /var/tmp/diff_new_pack.M24972/_new 2008-10-07 16:01:14.000000000 +0200 @@ -29,7 +29,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.1.2 -Release: 2 +Release: 3 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -66,6 +66,8 @@ /usr/share/wallpapers %changelog +* Tue Oct 07 2008 sbrabec@suse.cz +- Conflict with other branding providers (FATE#304881). * Wed Oct 01 2008 lrupp@suse.de - remove conflict with NLD theme * Sun Sep 28 2008 stbinner@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.M24972/_old 2008-10-07 16:01:14.000000000 +0200 +++ /var/tmp/diff_new_pack.M24972/_new 2008-10-07 16:01:14.000000000 +0200 @@ -34,7 +34,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.1.2 -Release: 2 +Release: 3 Source0: kdebase-workspace-%version.tar.bz2 Source1: rediff-plasma.sh Source2: titlebar_decor.png @@ -209,6 +209,7 @@ %if %suse_version > 1030 #BRAND: FIXME Provides: %{name}-branding = 11.1 +Conflicts: otherproviders(%{name}-branding) Supplements: packageand(kdebase4-workspace:branding-upstream) %endif @@ -235,6 +236,7 @@ %if %suse_version > 1030 #BRAND: FIXME Provides: kde4-kdm-branding = 11.1 +Conflicts: otherproviders(kde4-kdm-branding) Supplements: packageand(kde4-kdm:branding-upstream) %endif @@ -751,6 +753,8 @@ /usr/share/kde4/servicetypes/plasma-wallpaper.desktop %changelog +* Tue Oct 07 2008 sbrabec@suse.cz +- Conflict with other branding providers (FATE#304881). * Wed Oct 01 2008 lrupp@suse.de - remove conflict with NLD theme * Sun Sep 28 2008 stbinner@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org