- partial support for systemd in %service

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

diff --git a/rpm-build.sh b/rpm-build.sh
index 237b33f06325266211aee0167547897050d4b381..5aec8114c04b32057e1d9c8420fdb994b756babc 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
@@ -142,7 +145,7 @@ get-buildlog() {
                return
        esac
 
-       local url arch ftp=ftp://buildlogs.pld-linux.org
+       local url arch path ftp=ftp://buildlogs.pld-linux.org
        for arch in $archlist; do
                [ "$arch" ] || continue
                path=${url#$ftp}
@@ -200,7 +203,7 @@ urldiff() {
 # makes diff from kde svn path
 # requires: wget, tee
 kdediff() {
-       local url="$1"
+       local url="$1" r1 r2
        # --- branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc #624744:624745
        url=${url#*--- }
        echo >&2 "Process $url"
@@ -276,7 +279,7 @@ cvslog() {
 # the diff can be applied with patch -p1
 d() {
        local file="$1"
-       local dir
+       local dir diff
        if [[ "$file" = /* ]]; then
                # full path -- no idea where to strip
                dir=.
@@ -289,8 +292,9 @@ d() {
 
        (builtin cd "$dir"; dif $diff{~,})
 }
+
 rpmb() {
-       local SPEC SPECDIR
+       local SPEC SPECDIR arg
        for arg in "$@"; do
                case "$arg" in
                        *.spec) SPEC="$arg"