diff options
| author | Jerome Quelin <jquelin@mageia.org> | 2011-11-08 12:57:10 +0000 |
|---|---|---|
| committer | Jerome Quelin <jquelin@mageia.org> | 2011-11-08 12:57:10 +0000 |
| commit | 82ae6537a1df1ad2523d59cfb12f97afc990849e (patch) | |
| tree | 34162937d3872efa2a40f9c82885b415f3e95827 | |
| parent | 1f01b3be4afde5ba5c857f60664bad64e29168c3 (diff) | |
| download | rpm-setup-82ae6537a1df1ad2523d59cfb12f97afc990849e.tar rpm-setup-82ae6537a1df1ad2523d59cfb12f97afc990849e.tar.gz rpm-setup-82ae6537a1df1ad2523d59cfb12f97afc990849e.tar.bz2 rpm-setup-82ae6537a1df1ad2523d59cfb12f97afc990849e.tar.xz rpm-setup-82ae6537a1df1ad2523d59cfb12f97afc990849e.zip | |
v1.145 - extract perl requires from MYMETA.yml / MYMETA.json when present1.145
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | find-requires.in | 8 |
3 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,8 @@ - Add Java macros from JPackage ( %create_jar_links(), %remove_java_binaries, and gcj functions ) +Version 1.145 - 08 Nov 2011, by Jerome Quelin +- extract perl requires from MYMETA.yml / MYMETA.json when present + Version 1.144 - 19 Sep 2011, by Funda Wang - Add support for fdo /usr/share/help when find_lang diff --git a/configure.ac b/configure.ac index 71ec84b..018c0bf 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $ AC_PREREQ(2.59) -AC_INIT(rpm-mageia-setup, 1.144, jquelin@mageia.org) +AC_INIT(rpm-mageia-setup, 1.145, jquelin@mageia.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability no-dist-gzip dist-xz) AC_CONFIG_SRCDIR diff --git a/find-requires.in b/find-requires.in index b154c8d..751e8b1 100755 --- a/find-requires.in +++ b/find-requires.in @@ -179,8 +179,14 @@ fi # # --- Perl modules. +perlmymeta=$( echo $filelist | tr '[:blank:]' \\n | egrep 'doc/[^/]+/MYMETA.(yml|json)$' | head -1 ) perlmeta=$( echo $filelist | tr '[:blank:]' \\n | egrep 'doc/[^/]+/META.(yml|json)$' | head -1 ) -if [ -n "$perlmeta" ] +if [ -n "$perlmymeta" ] +then + [ -x @RPMVENDORDIR@/perl.req-from-meta ] && \ + @RPMVENDORDIR@/perl.req-from-meta $perlmymeta \ + && test ${PIPESTATUS[0]} -ne 0 && echo 'error: @RPMVENDORDIR@/perl.req-from-meta failed' >&2 && exit 1 +elif [ -n "$perlmeta" ] then [ -x @RPMVENDORDIR@/perl.req-from-meta ] && \ @RPMVENDORDIR@/perl.req-from-meta $perlmeta \ |