aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--NEWS3
-rw-r--r--configure.ac2
-rwxr-xr-xfind-provides.in4
-rwxr-xr-xfind-requires.in7
5 files changed, 10 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index f3d2278..3f25989 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ pkg_scripts = \
php.prov \
php.req \
pkgconfigdeps.sh \
+ pythoneggs.py \
rubygems.rb
pkg_gscripts = \
diff --git a/NEWS b/NEWS
index 50bc754..70f24e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Version 1.112 - 1 November 2011, by Per √ėyvind Karlsen
+- enable python egg provides/requires.
+
Version 1.111 - 30 October 2010, by Anssi Hannula
- generate requires on "python(abi) = x.y" instead of "python >= x.y" for
python modules to properly handle the strict dependency
diff --git a/configure.ac b/configure.ac
index 4707362..77b5640 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# $Id$
AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.111, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.112, nanardon@mandriva.org)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability)
AC_CONFIG_SRCDIR
diff --git a/find-provides.in b/find-provides.in
index 4bc489c..620c1d7 100755
--- a/find-provides.in
+++ b/find-provides.in
@@ -51,8 +51,8 @@ done | sort -u
#
# --- Python modules.
-[ -x @RPMVENDORDIR@/python.prov -a -n "$pythonlist" ] &&
- echo "$pythonlist" | tr '[:blank:]' \\n | @RPMVENDORDIR@/python.prov | sort -u
+[ -x @RPMVENDORDIR@/pythoneggs.py -a -n "$filelist" ] &&
+ echo "$filelist" | tr '[:blank:]' \\n | @RPMVENDORDIR@/pythoneggs.py --provides | sort -u
#
# --- Tcl modules.
diff --git a/find-requires.in b/find-requires.in
index 09b280c..79a4feb 100755
--- a/find-requires.in
+++ b/find-requires.in
@@ -102,8 +102,7 @@ fi
tmpdeplist=
for f in $filelist; do
- dep="`echo $f | sed -n -e "s@.*/usr/lib/perl5/\(vendor_perl/\|site_perl/\|\)\([.0-9]\{1,\}\).*\\$@perl-base >= $perlepoch\2@p" \
- -e "s@.*/usr/\(lib\|lib64\)/python\([.0-9]\{1,\}\).*\\$@python(abi) = \2@p"`"
+ dep="`echo $f | sed -n -e "s@.*/usr/lib/perl5/\(vendor_perl/\|site_perl/\|\)\([.0-9]\{1,\}\).*\\$@perl-base >= $perlepoch\2@p"`"
if [[ -n $dep && -z `echo $uniqdeplist $tmpdeplist|grep "$dep"` ]]; then
tmpdeplist+="$dep\n"
fi
@@ -208,8 +207,8 @@ fi
#
# --- Python modules.
-[ -x @RPMVENDORDIR@/python.req -a -n "$pythonlist" ] && \
- echo $pythonlist | tr '[:blank:]' \\n | @RPMVENDORDIR@/python.req | sort -u
+[ -x @RPMVENDORDIR@/pythoneggs.py -a -n "$filelist" ] && \
+ echo $filelist | tr '[:blank:]' \\n | @RPMVENDORDIR@/pythoneggs.py --requires | sort -u
#
# --- Tcl modules.