Hello community, here is the log from the commit of package kdebase4-workspace checked in at Wed Apr 16 18:36:18 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-15 20:09:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-16 18:34:18.689918000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 16 15:31:21 CEST 2008 - stbinner@suse.de + +- remove self conflict (bnc#379338) + +------------------------------------------------------------------- kdebase4-workspace.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.i31447/_old 2008-04-16 18:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.i31447/_new 2008-04-16 18:34:39.000000000 +0200 @@ -22,7 +22,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.0.3 -Release: 10 +Release: 12 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,6 +59,8 @@ /usr/share/wallpapers %changelog +* Wed Apr 16 2008 stbinner@suse.de +- remove self conflict (bnc#379338) * Mon Apr 14 2008 dmueller@suse.de - fix file conflicts * Mon Apr 14 2008 stbinner@suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.i31447/_old 2008-04-16 18:34:39.000000000 +0200 +++ /var/tmp/diff_new_pack.i31447/_new 2008-04-16 18:34:39.000000000 +0200 @@ -27,7 +27,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.0.3 -Release: 10 +Release: 12 %define rversion 4.0.3 Source0: kdebase-workspace-%rversion.tar.bz2 Source2: titlebar_decor.png @@ -71,7 +71,6 @@ Suggests: kdebase4-ksysguardd Suggests: kde4-kdm Suggests: kdebase4-wallpapers -Requires: %{name}-branding = 11.0 %description This package contains the basic packages for a K Desktop Environment @@ -168,10 +167,11 @@ Summary: The KDE Workspace Components License: GPL v2 or later Group: System/GUI/KDE -Provides: %{name}-branding = 11.0 -Conflicts: %{name}-branding -Supplements: branding-upstream +%if %suse_version > 1030 #BRAND: FIXME +Provides: %{name}-branding = 11.0 +Supplements: branding-upstream = 11.0 +%endif %description branding-upstream This package contains the basic packages for a K Desktop Environment @@ -220,7 +220,9 @@ Group: System/GUI/KDE Summary: KDE Window Manager %kde4_runtime_requires +%if %suse_version >1030 Requires: %{name}-branding = 11.0 +%endif %description -n kde4-kwin KWin is the window manager of the K desktop environment. @@ -245,6 +247,7 @@ License: GPL v2 or later Requires: kdebase4-workspace = %version Requires: libkde4-devel >= %_kde_platform_version +Requires: kde4-kwin = %version Provides: plasma-devel = %version Summary: The KDE Workspace Components Group: System/GUI/KDE @@ -632,6 +635,8 @@ /usr/%_lib/kde4/kgreet_*.so %changelog +* Wed Apr 16 2008 stbinner@suse.de +- remove self conflict (bnc#379338) * Mon Apr 14 2008 dmueller@suse.de - fix file conflicts * Mon Apr 14 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
participants (1)
-
root@Hilbert.suse.de