- up to 1.464

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

diff --git a/rpm-build.sh b/rpm-build.sh
index de55c3513c5a41cf5e3c121bb58a8ca5b4c8df78..c6abbfc10d5a028d45ddea1ed54aa0b5aea4ef18 100644 (file)
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -46,12 +46,20 @@ dist-requires() {
                esac
                shift
        done
-       poldek -q --sn $dist $opts --cmd what-requires $deps
+
+       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"
@@ -69,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
@@ -76,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