Hello community, here is the log from the commit of package bundle-lang checked in at Fri Aug 17 18:43:41 CEST 2007. -------- --- bundle-lang/bundle-lang-gnome.changes 2007-08-17 10:27:13.000000000 +0200 +++ /mounts/work_src_done/NOARCH/bundle-lang/bundle-lang-gnome.changes 2007-08-17 11:44:31.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 17 11:31:04 CEST 2007 - stbinner@suse.de + +- fix file conflict of digikam-doc and bundle-lang-kde-<language> + +------------------------------------------------------------------- bundle-lang-kde.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-gnome.spec ++++++ --- /var/tmp/diff_new_pack.E15816/_old 2007-08-17 18:43:21.000000000 +0200 +++ /var/tmp/diff_new_pack.E15816/_new 2007-08-17 18:43:21.000000000 +0200 @@ -16,7 +16,7 @@ License: X11/MIT Group: System/GUI/GNOME Version: 10.3 -Release: 9 +Release: 11 Summary: Translations for a Group of KDE Grograms BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -2783,6 +2783,8 @@ #LANGUAGE_FILES %changelog +* Fri Aug 17 2007 - stbinner@suse.de +- fix file conflict of digikam-doc and bundle-lang-kde-<language> * Fri Aug 17 2007 - aj@suse.de - pidgin-lang -> libpurple-lang - Remove gdpf and initial since they have been dropped. ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.E15816/_old 2007-08-17 18:43:21.000000000 +0200 +++ /var/tmp/diff_new_pack.E15816/_new 2007-08-17 18:43:21.000000000 +0200 @@ -16,7 +16,7 @@ License: X11/MIT Group: System/GUI/KDE Version: 10.3 -Release: 53 +Release: 55 Summary: Translations for a Group of KDE Programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -63,6 +63,7 @@ Provides: locale(amarok:de) Conflicts: amarok-lang-all Provides: digikam-doc = %(rpm -q --queryformat '%{VERSION}' digikam-doc) +Conflicts: digikam-doc Provides: digikam-lang = %(rpm -q --queryformat '%{VERSION}' digikam-lang) Provides: locale(digikam:de) Conflicts: digikam-lang-all @@ -197,6 +198,7 @@ Provides: locale(amarok:en) Conflicts: amarok-lang-all Provides: digikam-doc = %(rpm -q --queryformat '%{VERSION}' digikam-doc) +Conflicts: digikam-doc Provides: digikam-lang = %(rpm -q --queryformat '%{VERSION}' digikam-lang) Provides: locale(digikam:en) Conflicts: digikam-lang-all @@ -331,6 +333,7 @@ Provides: locale(amarok:es) Conflicts: amarok-lang-all Provides: digikam-doc = %(rpm -q --queryformat '%{VERSION}' digikam-doc) +Conflicts: digikam-doc Provides: digikam-lang = %(rpm -q --queryformat '%{VERSION}' digikam-lang) Provides: locale(digikam:es) Conflicts: digikam-lang-all @@ -465,6 +468,7 @@ Provides: locale(amarok:fr) Conflicts: amarok-lang-all Provides: digikam-doc = %(rpm -q --queryformat '%{VERSION}' digikam-doc) +Conflicts: digikam-doc Provides: digikam-lang = %(rpm -q --queryformat '%{VERSION}' digikam-lang) Provides: locale(digikam:fr) Conflicts: digikam-lang-all @@ -599,6 +603,7 @@ Provides: locale(amarok:pt) Conflicts: amarok-lang-all Provides: digikam-doc = %(rpm -q --queryformat '%{VERSION}' digikam-doc) +Conflicts: digikam-doc Provides: digikam-lang = %(rpm -q --queryformat '%{VERSION}' digikam-lang) Provides: locale(digikam:pt) Conflicts: digikam-lang-all @@ -778,6 +783,8 @@ #LANGUAGE_FILES %changelog +* Fri Aug 17 2007 - stbinner@suse.de +- fix file conflict of digikam-doc and bundle-lang-kde-<language> * Fri Aug 17 2007 - aj@suse.de - pidgin-lang -> libpurple-lang - Remove gdpf and initial since they have been dropped. ++++++ pre_checkin.sh ++++++ --- bundle-lang/pre_checkin.sh 2007-08-09 15:42:51.000000000 +0200 +++ /mounts/work_src_done/NOARCH/bundle-lang/pre_checkin.sh 2007-08-17 11:30:44.000000000 +0200 @@ -18,6 +18,9 @@ echo "Provides: locale(${pack/-lang/}:$lang)" echo "Conflicts: $pack-all" ;; + *-doc) + echo "Conflicts: $pack" + ;; esac done for b in $bundles; do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org