packages: pearize.sh - update noautoreq from command packaging 0.2

glen glen at pld-linux.org
Sat Aug 21 12:54:56 CEST 2010


Author: glen                         Date: Sat Aug 21 10:54:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update noautoreq from command packaging 0.2

---- Files affected:
packages:
   pearize.sh (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: packages/pearize.sh
diff -u packages/pearize.sh:1.50 packages/pearize.sh:1.51
--- packages/pearize.sh:1.50	Sat Aug 21 11:54:59 2010
+++ packages/pearize.sh	Sat Aug 21 12:54:51 2010
@@ -148,9 +148,17 @@
 if [ -n "$optional" ]; then
 	echo "$optional" | while read tag dep; do
 		for req in $dep; do
-			# strip single quotes that default template includes in @optional@ expand
-			# TODO: remove in php-pear-PEAR_Command_Packaging package
-			req=${req#\'} req=${req%\'}
+			case "$req" in
+			php-pear-*)
+				# convert pear package name to file pattern
+				req=$(echo "$req" | sed -e 's,^php-pear-,pear(,;y,-,/,;s,$,.*),')
+				;;
+			*)
+				# process only php-pear-* packages
+				continue
+				;;
+			esac
+
 			m=$(grep "^%define.*_noautoreq" $spec || :)
 			if [ -z "$m" ]; then
 				sed -i -e "/^BuildRoot:/{
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pearize.sh?r1=1.50&r2=1.51&f=u



More information about the pld-cvs-commit mailing list