drop kdediff, kde3.5 unmaintained and current kde in git probably

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

diff --git a/rpm-build.sh b/rpm-build.sh
old mode 100644 (file)
new mode 100755 (executable)
index 472d6c1..4364704
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -96,6 +96,8 @@ dist-verify() {
                ignore="$ignore innobackup"
                # use ac-updates
                ignore="$ignore ntp-client ntp"
+               # php4 only(php-pecl-tidy), for php<5.2(php-pecl-filter)
+               ignore="$ignore php-pecl-tidy php-pecl-filter"
 
                # renamed to vim-syntax-txt2tags
                ignore="$ignore txt2tags-vim"
@@ -118,7 +120,9 @@ autotag() {
                s=${s%:*}
                # ensure package ends with .spec
                s=${s%.spec}.spec
-               out=$(cvs status -v $s | awk "!/Sticky/&&/auto-$dist-/{if (!a++) print \$1}")
+               git fetch --tags
+               out=$(git for-each-ref --count=1 --sort=-authordate refs/tags/auto/$dist \
+                       --format='%(refname:short)')
                echo "$s:$out"
        done
 }
@@ -145,7 +149,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}
@@ -166,63 +170,9 @@ get-buildlog() {
 
 fi # no $dist set
 
-alias cv='cvs status -v'
 alias adif="dif -x '*.m4' -x ltmain.sh -x install-sh -x depcomp -x 'Makefile.in' -x compile -x 'config.*' -x configure -x missing -x mkinstalldirs -x autom4te.cache"
 alias pclean="sed -i~ -e '/^\(?\|=\+$\|unchanged:\|diff\|only\|Only\|Files\|Common\|Index:\|RCS file\|retrieving\)/d'"
 
-# makes diff from PLD CVS urls
-# requires: cvs, tee
-urldiff() {
-       local url="$1"
-       if [ -z "$url" ]; then
-               echo >&2 "Reading STDIN"
-               read url
-       fi
-
-       echo >&2 "Process $url"
-       local file="$url"
-       file=${file#*SPECS/}
-       file=${file#*SOURCES/}
-       file=${file##*/}
-       local r1=${file#*r1=}
-       local r2=${r1#*r2=}
-       r2=${r2%%[&;]*}
-       r1=${r1%%[&;]*}
-       file=${file%\?*}
-       file=${file%.diff}
-
-       echo >&2 "$file: $r1 -> $r2"
-
-       if [ -t 1 ]; then
-               cvs diff -u -r$r1 -r$r2 $file | tee m.patch | diffcol
-       else
-               cvs diff -u -r$r1 -r$r2 $file
-       fi
-}
-
-# makes diff from kde svn path
-# requires: wget, tee
-kdediff() {
-       local url="$1"
-       # --- branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc #624744:624745
-       url=${url#*--- }
-       echo >&2 "Process $url"
-       r1=${url#*#}
-       r2=${r1#*:}
-       r1=${r1%:*}
-
-       #  http://websvn.kde.org/branches/KDE/3.5/kdepim/kpilot/conduits/vcalconduit/vcalRecord.cc?rev=624745&r1=612579&r2=624745&makepatch=1&diff_format=u
-       #  http://websvn.kde.org/branches/KDE/3.5/kdenetwork/kopete/protocols/oscar/aim/aimcontact.cpp?r1=609808&r2=673027&view=patch
-       url=http://websvn.kde.org/${url% *}
-       url="$url?r1=$r1&r2=$r2&view=patch"
-
-       if [ -t 1 ]; then
-               wget "$url" -O -| tee m.patch | diffcol
-       else
-               wget "$url" -O -
-       fi
-}
-
 # merges two patches
 # requires: patchutils
 pmerge() {
@@ -267,19 +217,11 @@ sed -e '
 ' ${1:+"$@"}
 }
 
-# chdir to file location and do 'cvs log'
-cvslog() {
-       local f="$1"
-       local d="${f%/*}"
-       [ "$d" = "$f" ] && d=.
-       (builtin cd $d && cvs log ${f##*/})
-}
-
 # does diff between FILE~ and FILE
 # 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=.
@@ -292,8 +234,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"