Hello community, here is the log from the commit of package kdebase4 checked in at Wed Aug 15 20:27:58 CEST 2007. -------- --- KDE/kdebase4/kdebase4.changes 2007-08-09 09:57:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2007-08-15 10:44:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 15 10:44:40 CEST 2007 - stbinner@suse.de + +- fix more file conflicts + +------------------------------------------------------------------- kdebase4-wallpapers.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.Z25968/_old 2007-08-15 20:26:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Z25968/_new 2007-08-15 20:26:40.000000000 +0200 @@ -21,7 +21,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 3.92.0.svn697325 -Release: 1 +Release: 7 Source0: kdebase.tar.bz2 Source1: _upstream Source2: rpmlintrc @@ -32,6 +32,7 @@ Patch3: show-runtime-only-in-kde.diff Patch4: no-kappfinder.diff Requires: kdebase4-runtime +Conflicts: yast2-theme-NLD Suggests: kde4-konsole Suggests: kde4-dolphin Suggests: kde4-konqueror @@ -1868,8 +1869,6 @@ %_kde_share_dir/apps/kconf_update/klipper-kde31.sh -%_kde_share_dir/apps/kconf_update/move_favicons.sh - %_kde_share_dir/apps/kconf_update/move_konqsidebartng_entries.sh %_kde_share_dir/apps/kconf_update/move_session_config.sh @@ -1877,6 +1876,8 @@ %_kde_share_dir/apps/kconf_update/pluginlibFix.pl %changelog +* Wed Aug 15 2007 - stbinner@suse.de +- fix more file conflicts * Thu Aug 09 2007 - stbinner@suse.de - update to 3.92.0.svn697325 - fix file conflicts ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.Z25968/_old 2007-08-15 20:26:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Z25968/_new 2007-08-15 20:26:40.000000000 +0200 @@ -21,7 +21,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 3.92.0 -Release: 10 +Release: 16 Source0: kdebase.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -58,6 +58,8 @@ /usr/share/wallpapers %changelog +* Wed Aug 15 2007 - stbinner@suse.de +- fix more file conflicts * Thu Aug 09 2007 - stbinner@suse.de - update to 3.92.0.svn697325 - fix file conflicts ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org