don't override GETURI when using wget

[packages/rpm-build-tools.git] / pearize.sh

diff --git a/pearize.sh b/pearize.sh
old mode 100644 (file)
new mode 100755 (executable)
index 481a8dc..55363d6
--- a/pearize.sh
+++ b/pearize.sh
@@ -28,6 +28,9 @@
 #
 # Send blames and beer\b\b\b\bideas to glen@pld-linux.org
 
+PROGRAM=${0##*/}
+APPDIR=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d")
+
 set -e
 spec="$1"
 if [ -z "$spec" ]; then
@@ -58,7 +61,7 @@ if [ -z "$tarball" ]; then
 fi
 
 if [ ! -f $tarball ]; then
-       ./builder -g "$spec"
+       $APPDIR/builder -g "$spec"
 fi
 
 stmp=$(mktemp "${TMPDIR:-/tmp}/fragXXXXXX")
@@ -101,8 +104,12 @@ preamble=$(mktemp "${TMPDIR:-/tmp}/fragXXXXXX")
 sed -ne '/^Name:/,/^BuildRoot/p' $spec > $preamble
 
 # create backup
-bak=$(cp -fbv $spec $spec | awk '{print $NF}' | tr -d "['\`]" )
+bak=$(LC_ALL=C cp -fbv $spec $spec | awk '{print $NF}' | tr -d "['\`]" )
 
+# ensure rpm-build-macros is present
+if ! grep -q "^BuildRequires:.*rpmbuild(macros)" $preamble; then
+       sed -i -e "/^BuildRequires:.*rpm-php-pearprov/aBuildRequires:\trpmbuild(macros) >= 1.300" $spec
+fi
 # parse requires
 requires=$(grep '^BuildRequires:' $template || :)
 if [ -n "$requires" ]; then
@@ -224,8 +231,9 @@ fi
 
 # parse state
 state=$(awk '/^State:/{print $2}' $template)
-sed -i -e "/^%define.*_status/{
-       /%define.*_status.*$state/!s/.*/%define\t\t_status\t\t$state/
+sed -i -e "/^%define.*_\?status/{
+       s/%define[[:space:]]*_status.*/%define\t\t_status\t\t$state/
+       s/%define[[:space:]]*status.*/%define\t\tstatus\t\t$state/
 }" $spec
 
 # parse license