- use rpmcppflags

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

diff --git a/rpm-build.sh b/rpm-build.sh
index 208281beb387a5019d3230df68b1ea09a0c90719..c6abbfc10d5a028d45ddea1ed54aa0b5aea4ef18 100644 (file)
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -15,10 +15,10 @@ esac
 if [ "$dist" ]; then
 
 alias ipoldek-$dist="poldek -q --sn $dist --cmd"
-alias $dist-requires="ipoldek-$dist what-requires"
 alias $dist-provides="ipoldek-$dist what-provides"
 alias $dist-tag="./builder -cf -T $(echo $dist | tr '[a-z]' '[A-Z]')-branch -r HEAD"
 alias $dist-verify=dist-verify
+alias $dist-requires=dist-requires
 
 # undo spec utf8
 # note: it will do it blindly, so any lang other than -pl is most likely broken
@@ -29,9 +29,37 @@ specutfundo() {
        rm -f m
 }
 
+dist-requires() {
+       local opts deps
+       while [ $# -gt 0 ]; do
+               case "$1" in
+               --sn)
+                       opts="$opts $1 $2"
+                       shift
+                       ;;
+               -*)
+                       opts="$opts $1"
+                       ;;
+               *)
+                       deps="$deps $1"
+                       ;;
+               esac
+               shift
+       done
+
+       case "$dist" in
+       ac)
+               opts="$opts --sn=$dist-updates"
+               ;;
+       esac
+
+       poldek -q -Q --sn $dist $opts --cmd what-requires $deps
+}
+
 dist-verify() {
        local args sn
        sn="--sn $dist"
+
        case "$dist" in
        ac)
                sn="$sn --sn $dist-updates"
@@ -49,6 +77,20 @@ dist-verify() {
                ignore="$ignore courier-authlib-userdb courier-authlib-pipe"
                # obsoleted, squid 2.6
                ignore="$ignore squid-winbind_acl squid-winbind_auth"
+               # obsoleted with 1.0.4
+               ignore="$ignore python-numpy-FFT python-numpy-MA python-numpy-RNG"
+               # subpkgs renamed
+               ignore="$ignore apache1-doc apache1-index"
+               # obsoleted by kadu-module-mediaplayer-amarok
+               ignore="$ignore kadu-module-amarok"
+               # obsoleted by kadu-module-mediaplayer-xmms
+               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"
+               # renamed to vim-syntax-txt2tags
+               ignore="$ignore txt2tags-vim"
                for a in $ignore; do
                        args="$args --ignore=$a"
                done
@@ -56,7 +98,7 @@ dist-verify() {
        esac
 
        poldek $sn --up --upa -q "$@"
-       poldek $sn --noignore --verify=deps $args "$@"
+       poldek $sn --uniq --noignore --verify=deps $args "$@"
 }
 
 # displays latest used tag for a specfile
@@ -64,7 +106,7 @@ autotag() {
        local out
        for a in "$@"; do
                s=${a%.spec}.spec
-               out=$(cvs status -v $s | awk "/auto-$dist-/{if (!a++) print \$1}")
+               out=$(cvs status -v $s | awk "!/Sticky/&&/auto-$dist-/{if (!a++) print \$1}")
                echo "$s:$out"
        done
 }