Author: glen Date: Fri Aug 20 16:39:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- ext deps not noted in install log, process manually
---- Files affected:
packages:
pearize.sh (1.48 -> 1.49)
---- Diffs:
================================================================
Index: packages/pearize.sh
diff -u packages/pearize.sh:1.48 packages/pearize.sh:1.49
--- packages/pearize.sh:1.48 Fri Aug 20 14:52:57 2010
+++ packages/pearize.sh Fri Aug 20 18:39:35 2010
@@ -57,6 +57,7 @@
fi
stmp=$(mktemp "${TMPDIR:-/tmp}/fragXXXXXX")
+template=pearize.spec
cat > $stmp <<'EOF'
@extra_headers@
Optional: @optional@
@@ -65,8 +66,7 @@
License: @release_license@
State: @release_state@
EOF
-pear make-rpm-spec --spec-template=$stmp --output=pearize.spec $tarball
-template=pearize.spec
+pear make-rpm-spec --spec-template=$stmp --output=$template $tarball
rm -f $stmp
mv $template .$template~
@@ -161,6 +161,24 @@
done
done
fi
+
+optional=$(grep '^Optional-ext:' $template || :)
+if [ -n "$optional" ]; then
+ tmp=$(mktemp "${TMPDIR:-/tmp}/fragXXXXXX")
+ echo "$optional" | while read tag ext; do
+ grep -q "PHP extension .$ext" && continue
+ cat > $tmp <<-EOF
+ echo '%{name} can optionally use PHP extension "$ext"' >>
optional-packages.txt
+ EOF
+ sed -i -e "
+ /%pear_package_setup/ {
+ r $tmp
+ }
+ " $spec
+ done
+ rm -f .ext.tmp
+fi
+
has_opt=$(grep -Ec '^Optional-(pkg|ext):' $template || :)
if [ "$has_opt" -gt 0 ]; then
if ! grep -q 'rpmbuild(macros)' $spec; then
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pearize.sh?r1=1.48&r2=1.49&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
