Hello community, here is the log from the commit of package kdebase3-SuSE checked in at Tue Aug 14 02:58:37 CEST 2007. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-08-12 10:36:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-08-13 22:46:04.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 13 22:46:00 CEST 2007 - stbinner@suse.de + +- fix file conflict + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.Eo5004/_old 2007-08-14 02:58:27.000000000 +0200 +++ /var/tmp/diff_new_pack.Eo5004/_new 2007-08-14 02:58:28.000000000 +0200 @@ -32,7 +32,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 10.3 -Release: 105 +Release: 107 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -156,6 +156,7 @@ /etc/opt/kde3/share/applications /etc/opt/kde3/share/doc/ /etc/opt/kde3/share/mimelnk +%exclude /opt/kde3/share/mimelnk/application/x-sysinfo.desktop /opt/kde3/share/mimelnk/application/*.desktop /opt/kde3/share/icons/* %config(noreplace) /etc/opt/kde3/share/config/*rc @@ -207,6 +208,8 @@ /opt/kde3/share/services/sysinfo.protocol %changelog +* Mon Aug 13 2007 - stbinner@suse.de +- fix file conflict * Sun Aug 12 2007 - wstephenson@suse.de - Move images and non-config files out of /etc (#222184) * Sat Aug 11 2007 - 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