Hello community, here is the log from the commit of package rpm checked in at Thu May 17 00:32:17 CEST 2007. -------- --- rpm/rpm.changes 2007-05-03 03:31:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm.changes 2007-05-16 12:16:59.881039000 +0200 @@ -1,0 +2,15 @@ +Wed May 16 12:16:44 CEST 2007 - mls@suse.de + +- fix autodeps.diff mono logic + +------------------------------------------------------------------- +Mon May 14 13:47:02 CEST 2007 - coolo@suse.de + +- correctly mark KDE documentation as %doc in find-lang.sh + +------------------------------------------------------------------- +Fri May 11 14:34:35 CEST 2007 - coolo@suse.de + +- adding %lang_package to simplify seperating translations + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.a23584/_old 2007-05-17 00:31:40.000000000 +0200 +++ /var/tmp/diff_new_pack.a23584/_new 2007-05-17 00:31:40.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 112 +Release: 117 Requires: rpm = %{version} %py_requires ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.a23584/_old 2007-05-17 00:31:40.000000000 +0200 +++ /var/tmp/diff_new_pack.a23584/_new 2007-05-17 00:31:40.000000000 +0200 @@ -20,7 +20,7 @@ Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 105 +Release: 107 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -321,7 +321,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 333 +Release: 335 # %description -n popt @@ -344,7 +344,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 333 +Release: 335 Requires: popt = 1.7 Requires: glibc-devel @@ -380,6 +380,12 @@ %doc %{_mandir}/man3/popt.3* %changelog +* Wed May 16 2007 - mls@suse.de +- fix autodeps.diff mono logic +* Mon May 14 2007 - coolo@suse.de +- correctly mark KDE documentation as %%doc in find-lang.sh +* Fri May 11 2007 - coolo@suse.de +- adding %%lang_package to simplify seperating translations * Sat Apr 28 2007 - wberrier@suse.de - autodeps.diff - bnc #227362 -Print warning if mono assembiles are found but mono-find-* fails ++++++ autodeps.diff ++++++ --- /var/tmp/diff_new_pack.a23584/_old 2007-05-17 00:31:40.000000000 +0200 +++ /var/tmp/diff_new_pack.a23584/_new 2007-05-17 00:31:40.000000000 +0200 @@ -2,7 +2,7 @@ --- ./autodeps/linux.prov.orig 2002-04-08 19:13:35.000000000 +0000 +++ ./autodeps/linux.prov 2005-12-17 01:49:17.000000000 +0000 -@@ -2,60 +2,71 @@ +@@ -2,60 +2,72 @@ # This script reads filenames from STDIN and outputs any relevant provides # information that needs to be included in the package. @@ -93,8 +93,9 @@ +# +# --- Mono exes/dlls +: ${MONO_PREFIX=/usr} -+[ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] && ++if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then + printf "%s\n" "${monolist[@]}" | MONO_PATH=$MONO_PREFIX/lib${MONO_PATH:+:$MONO_PATH} prefix=$MONO_PREFIX $MONO_PREFIX/bin/mono-find-provides || echo "WARNING: MONO RPM PROVIDES WERE NOT GENERATED FOR THIS BUILD!!" 1>&2 ++fi + +# +# --- Kernel module exported symbols @@ -227,7 +228,7 @@ print LIBNAME "(" $4 ")'$lib64'"; } ' -@@ -118,17 +122,28 @@ done | sort -u +@@ -118,17 +122,29 @@ done | sort -u # # --- Perl modules. @@ -251,8 +252,9 @@ +# +# --- Mono exes/dlls +: ${MONO_PREFIX=/usr} -+[ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] && ++if [ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] ; then + printf "%s\n" "${monolist[@]}" | MONO_PATH=$MONO_PREFIX/lib${MONO_PATH:+:$MONO_PATH} prefix=$MONO_PREFIX $MONO_PREFIX/bin/mono-find-requires || echo "WARNING: MONO RPM REQUIRES WERE NOT GENERATED FOR THIS BUILD!!" 1>&2 ++fi + +# +# --- Kernel module imported symbols ++++++ findlang.diff ++++++ --- /var/tmp/diff_new_pack.a23584/_old 2007-05-17 00:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.a23584/_new 2007-05-17 00:31:41.000000000 +0200 @@ -99,9 +99,9 @@ '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\):: '"$ALL_NAME$KDE"'s:\(.*/doc/kde/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3: +'"$NO_ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'/\):: -+'"$NO_ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) \1\2\3: ++'"$NO_ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/'"$NAME"'\)$:%lang(\2) %doc \1\2\3: +'"$ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\):: -+'"$ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3: ++'"$ALL_NAME$KDE"'s:\(.*/kde.*share/doc/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) %doc \1\2\3: s:^\([^%].*\):: s:%lang(C) :: -/^$/d' >> $MO_NAME ++++++ rpm-suse_macros ++++++ --- rpm/rpm-suse_macros 2007-05-03 00:04:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm-suse_macros 2007-05-11 13:02:23.887112000 +0200 @@ -457,3 +457,13 @@ # find-supplements.ksyms parses this macro directly out of the spec file: %supplements_kernel_module() \ %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)} + +# Template for lang sub-package. +%lang_package \ +%package lang\ +Summary: Languages for package %{name}\ +Group: System/Localization\ +Requires: %{name} = %{version}\ +%description lang\ +Provides translations to the package %{name}. + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org