From 4b8207eec4286ff57562816b6d9c450816697508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= <peroyvind@mandriva.org>
Date: Sun, 23 Nov 2008 21:02:58 +0000
Subject: don't hardcore epoch tag in versioned perl-base dependency

---
 Makefile.am      |  3 ++-
 configure.ac     | 13 +++++++++++++
 find-requires.in |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8f43654..3bc3aa5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,8 @@ edit = sed \
 	-e 's,@RPMSYSCONFDIR\@,$(RPMSYSCONFDIR),g'\
 	-e 's,@RPMOS\@,$(RPMOS),g' \
 	-e 's,@CANONTARGETCPU\@,$(CANONTARGETCPU),g' \
-	-e 's,@RPMALLARCH\@,$(RPMALLARCH),g' 
+	-e 's,@RPMALLARCH\@,$(RPMALLARCH),g' \
+	-e 's,@PERLEPOCH\@,$(PERLEPOCH),g'
 
 %: %.in Makefile
 	$(edit) $< > $@
diff --git a/configure.ac b/configure.ac
index 004fc63..b624fee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,19 @@ 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 b2c28bd..341cae0 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -93,7 +93,7 @@ fi
 #
 # --- Perl or python deps
 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 >= 2:\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 >= @PERLEPOCH@\2@p" -e 's@.*/usr/\(lib\|lib64\)/python\([.0-9]\{1,\}\).*$@python-base >= \2@p'
 done | sort -u
 
 
-- 
cgit v1.2.1