- use our own build type in cmake

[packages/rpm-pld-macros.git] / rpm-build.sh

diff --git a/rpm-build.sh b/rpm-build.sh
index 937ea63df267808121db3c8a3e4367fd46a0a0fa..472d6c1d97afa51bc174d274340a2f61936fc759 100644 (file)
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -86,8 +86,8 @@ dist-verify() {
                ignore="$ignore kadu-module-xmms"
                # obsoleted by kadu 0.6.0
                ignore="$ignore kadu-theme-icons-crystal16 kadu-theme-icons-crystal22 kadu-theme-icons-nuvola16 kadu-theme-icons-nuvola22 kadu-module-iwait4u"
-               # obsoleted
-               ignore="$ignore php-pear-Net_Ping-tests"
+               # obsoleted pear test packages
+               ignore="$ignore php-*-tests"
                # obsoleted
                ignore="$ignore nmap-X11"
                # mksd dependency not distributale
@@ -112,9 +112,12 @@ dist-verify() {
 
 # displays latest used tag for a specfile
 autotag() {
-       local out
-       for a in "$@"; do
-               s=${a%.spec}.spec
+       local out s
+       for s in "$@"; do
+               # strip branches
+               s=${s%:*}
+               # ensure package ends with .spec
+               s=${s%.spec}.spec
                out=$(cvs status -v $s | awk "!/Sticky/&&/auto-$dist-/{if (!a++) print \$1}")
                echo "$s:$out"
        done
@@ -272,7 +275,7 @@ cvslog() {
        (builtin cd $d && cvs log ${f##*/})
 }
 
-# does diff between FILE and FILE~
+# does diff between FILE~ and FILE
 # the diff can be applied with patch -p1
 d() {
        local file="$1"