File pythondeps.diff of Package rpm.468

Overview Repositories Revisions Requests Users Attributes Meta

File pythondeps.diff of Package rpm.468

--- ./autodeps/linux.prov.orig	2010-04-08 13:32:56.000000000 +0000
+++ ./autodeps/linux.prov	2010-04-08 13:38:44.000000000 +0000
@@ -11,7 +11,7 @@ filelist=($(printf "%s\n" "${filelist[@]
 solist=($(printf "%s\n" "${filelist[@]}" | grep "\\.so" | grep -v "^/lib/ld.so" | \
 	  tr '\n' '\0' | xargs -0 -r file -L | grep "ELF.*shared object" | \
 	  cut -d: -f1))
-pythonlist=
+pythonlist=($(printf "%s\n" "${filelist[@]}" | egrep '/usr/bin/python.\..$'))
 tcllist=
 monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$"))
 mimetypelist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(desktop)\$"))
@@ -55,8 +55,8 @@ done | sort -u
 
 #
 # --- Python modules.
-[ -x /usr/lib/rpm/python.prov -a -n "$pythonlist" ] &&
-    printf "%s\n" "${pythonlist[@]}" | /usr/lib/rpm/python.prov | sort -u
+[ -x /usr/lib/rpm/pythondeps.sh -a -n "$pythonlist" ] &&
+    printf "%s\n" "${pythonlist[@]}" | /usr/lib/rpm/pythondeps.sh -P | sort -u
 
 #
 # --- Tcl modules.
--- ./autodeps/linux.req.orig	2010-04-08 13:36:47.000000000 +0000
+++ ./autodeps/linux.req	2010-04-08 13:40:25.000000000 +0000
@@ -32,7 +32,7 @@ liblist=($(printf "%s\0" "${filelist[@]}
 
 interplist=()
 perllist=()
-pythonlist=()
+pythonlist=($(printf "%s\n" "${filelist[@]}" | egrep '/usr/lib[^/]*/python.\..'))
 tcllist=()
 monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)(\\.config)?\$"))
 
@@ -128,8 +128,8 @@ done | sort -u
 
 #
 # --- Python modules.
-[ -x /usr/lib/rpm/python.req -a -n "$pythonlist" ] && \
-    printf "%s\n" "${pythonlist[@]}" | /usr/lib/rpm/python.req | sort -u
+[ -x /usr/lib/rpm/pythondeps.sh -a -n "$pythonlist" ] && \
+    printf "%s\n" "${pythonlist[@]}" | /usr/lib/rpm/pythondeps.sh -R | sort -u
 
 #
 # --- Tcl modules.
--- ./scripts/pythondeps.sh.orig	2010-04-08 13:40:34.000000000 +0000
+++ ./scripts/pythondeps.sh	2010-04-08 13:42:19.000000000 +0000
@@ -5,17 +5,17 @@
     exit 0
 }
 
-PYVER=`python -c "import sys; v=sys.version_info[:2]; print '%d.%d'%v"`
 case $1 in
 -P|--provides)
     shift
-    grep "/usr/bin/python\*\$" >& /dev/null && echo "python(abi) = ${PYVER}"
-    exit 0
+    grep "/usr/bin/python.\..$" \
+	| sed -e "s|.*/usr/bin/python$.\..$|python(abi) = \1|"
     ;;
 -R|--requires)
     shift
-    grep "/usr/lib[^/]*/python${PYVER}/" >& /dev/null && echo "python(abi) = ${PYVER}"
-    exit 0
+    grep "/usr/lib[^/]*/python.\../.*" \
+	| sed -e "s|.*/usr/lib[^/]*/python$.\..$/.*|python(abi) = \1|g" \
+	| sort | uniq
     ;;
 esac

Places

File pythondeps.diff of Package rpm.468

Places