aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac13
-rwxr-xr-xfind-requires.in6
3 files changed, 6 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index 3bc3aa5..cc728de 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,8 +86,7 @@ edit = sed \
-e 's,@RPMSYSCONFDIR\@,$(RPMSYSCONFDIR),g'\
-e 's,@RPMOS\@,$(RPMOS),g' \
-e 's,@CANONTARGETCPU\@,$(CANONTARGETCPU),g' \
- -e 's,@RPMALLARCH\@,$(RPMALLARCH),g' \
- -e 's,@PERLEPOCH\@,$(PERLEPOCH),g'
+ -e 's,@RPMALLARCH\@,$(RPMALLARCH),g'
%: %.in Makefile
$(edit) $< > $@
diff --git a/configure.ac b/configure.ac
index 953099d..bc7af73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,19 +107,6 @@ else
usrprefix=$prefix
fi
-AC_MSG_CHECKING([for epoch tag of perl-base package])
-PERLEPOCH=`rpm -q --queryformat '%|EPOCH?{[%{EPOCH}]:}|' perl-base`
-if test "$?" != 0; then
- PERLEPOCH=""
-fi
-AC_SUBST(PERLEPOCH)
-
-if test $PERLEPOCH; then
- AC_MSG_RESULT([$PERLEPOCH])
-else
- AC_MSG_RESULT([no])
-fi
-
RPMLIBDIR="${usrprefix}/lib/rpm"
AC_ARG_WITH(rpmlibdir, [ --with-rpmlibdir=dir location of rpm config file ])
if test $with_rpmlibdir; then
diff --git a/find-requires.in b/find-requires.in
index 341cae0..7f1930b 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -92,8 +92,12 @@ fi
#
# --- Perl or python deps
+PERL_EPOCH=`rpm -q --queryformat '%|EPOCH?{[%{EPOCH}]:}|' perl-base`
+if [ $? != 0 ]; then
+ unset PERL_EPOCH
+fi
for f in $filelist; do
- echo $f | sed -n -e 's@.*/usr/lib/perl5/\(site_perl/\)\([0-9]\{1,\}\.[0-9]\{1,\}\)\.\([0-9]\{1,\}\).*$@perl-base >= \2.\3@p' -e "s@.*/usr/lib/perl5/\(vendor_perl\/\)\([.0-9]\{1,\}\).*\$@perl-base >= @PERLEPOCH@\2@p" -e 's@.*/usr/\(lib\|lib64\)/python\([.0-9]\{1,\}\).*$@python-base >= \2@p'
+ echo $f | sed -n -e 's@.*/usr/lib/perl5/\(site_perl/\)\([0-9]\{1,\}\.[0-9]\{1,\}\)\.\([0-9]\{1,\}\).*$@perl-base >= \2.\3@p' -e "s@.*/usr/lib/perl5/\(vendor_perl\/\)\([.0-9]\{1,\}\).*\$@perl-base >= $PERL_EPOCH\2@p" -e 's@.*/usr/\(lib\|lib64\)/python\([.0-9]\{1,\}\).*$@python-base >= \2@p'
done | sort -u