diff --git a/autodeps.diff b/autodeps.diff index eb8e567..8f19ecd 100644 --- a/autodeps.diff +++ b/autodeps.diff @@ -18,7 +18,7 @@ Some (probably SUSE specific) changes to linux.prov and linux.req + cut -d: -f1)) pythonlist= tcllist= -+monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) ++monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)(\\.config)?\$")) # # --- Alpha does not mark 64bit dependencies @@ -93,8 +93,8 @@ Some (probably SUSE specific) changes to linux.prov and linux.req +# +# --- Mono exes/dlls +: ${MONO_PREFIX=/usr} -+[ -x $MONO_PREFIX/bin/mono -a -f $MONO_PREFIX/bin/mono-find-provides -a -n "$monolist" ] && -+ printf "%s\n" "${monolist[@]}" | MONO_PATH=$MONO_PREFIX/lib${MONO_PATH:+:$MONO_PATH} prefix=$MONO_PREFIX $MONO_PREFIX/bin/mono-find-provides ++[ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] && ++ 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 + +# +# --- Kernel module exported symbols @@ -251,8 +251,8 @@ Some (probably SUSE specific) changes to linux.prov and linux.req +# +# --- Mono exes/dlls +: ${MONO_PREFIX=/usr} -+[ -x $MONO_PREFIX/bin/mono -a -f $MONO_PREFIX/bin/mono-find-requires -a -n "$monolist" ] && -+ printf "%s\n" "${monolist[@]}" | MONO_PATH=$MONO_PREFIX/lib${MONO_PATH:+:$MONO_PATH} prefix=$MONO_PREFIX $MONO_PREFIX/bin/mono-find-requires ++[ -x $MONO_PREFIX/bin/mono -a -n "$monolist" ] && ++ 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 + +# +# --- Kernel module imported symbols diff --git a/rpm-python.spec b/rpm-python.spec index 5b910d8..337e561 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 109 +Release: 112 Requires: rpm = %{version} %py_requires diff --git a/rpm.changes b/rpm.changes index 9431561..7914067 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Apr 28 00:43:30 CEST 2007 - wberrier@suse.de + +- autodeps.diff - bnc #227362 + -Print warning if mono assembiles are found but mono-find-* fails + (solution is to make sure mono-devel is installed) + -Also include .config files when searching for mono assemblies. + (bnc #210224) + ------------------------------------------------------------------- Tue Apr 24 17:12:47 CEST 2007 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 7f2e8ae..616b862 100644 --- a/rpm.spec +++ b/rpm.spec @@ -20,7 +20,7 @@ PreReq: %insserv_prereq %fillup_prereq popt = %{popt_version} permission Autoreqprov: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 103 +Release: 105 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -321,7 +321,7 @@ Summary: A C library for parsing command line parameters License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 331 +Release: 333 # %description -n popt @@ -344,7 +344,7 @@ Summary: C Library for Parsing Command Line Parameters License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Version: 1.7 -Release: 331 +Release: 333 Requires: popt = 1.7 Requires: glibc-devel @@ -380,6 +380,12 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Sat Apr 28 2007 - wberrier@suse.de +- autodeps.diff - bnc #227362 + -Print warning if mono assembiles are found but mono-find-* fails + (solution is to make sure mono-devel is installed) + -Also include .config files when searching for mono assemblies. + (bnc #210224) * Tue Apr 24 2007 - mls@suse.de - enable noprovides patch again. disable part of the patch so that rpm checks the package provides