- adopt for command packaging 0.2

Changed files:
    pearize.sh -> 1.50

diff --git a/pearize.sh b/pearize.sh
index d7b90487b068963ee54e45a7fe7252fa88c94061..157c1e42295e9e607360eb4dfa40c5d02e1664b2 100644 (file)
--- a/pearize.sh
+++ b/pearize.sh
@@ -60,9 +60,6 @@ stmp=$(mktemp "${TMPDIR:-/tmp}/fragXXXXXX")
 template=pearize.spec
 cat > $stmp <<'EOF'
 @extra_headers@
-Optional: @optional@
-@optional-pkg@
-@optional-ext@
 License: @release_license@
 State: @release_state@
 EOF
@@ -115,6 +112,16 @@ sed -ne '/^Name:/,/^BuildRoot/p' $spec > $preamble
 bak=$(cp -fbv $spec $spec | awk '{print $NF}' | tr -d "['\`]" )
 
 # parse requires
+requires=$(grep '^BuildRequires:' $template || :)
+if [ -n "$requires" ]; then
+       echo "$requires" | while read tag dep; do
+               dep=$(add_epoch $dep)
+               if ! grep -q "^BuildRequires:.*$dep" $preamble; then
+                       sed -i -e "/^BuildRoot/iBuildRequires:\t$dep" $spec
+               fi
+       done
+fi
+
 requires=$(grep '^Requires:' $template || :)
 if [ -n "$requires" ]; then
        echo "$requires" | while read tag dep; do
@@ -137,7 +144,7 @@ if [ -n "$conflicts" ]; then
 fi
 
 # parse optional deps
-optional=$(grep '^Optional:' $template || :)
+optional=$(grep '^Suggests:' $template || :)
 if [ -n "$optional" ]; then
        echo "$optional" | while read tag dep; do
                for req in $dep; do