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
index ac44f38e84dd071c27ec39bc6d4edd246e7d88e1..4364704b94a6cc8bada741b5e4ac05d80371daea 100755 (executable)
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -120,6 +120,7 @@ autotag() {
                s=${s%:*}
                # ensure package ends with .spec
                s=${s%.spec}.spec
+               git fetch --tags
                out=$(git for-each-ref --count=1 --sort=-authordate refs/tags/auto/$dist \
                        --format='%(refname:short)')
                echo "$s:$out"
@@ -169,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" r1 r2
-       # --- 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() {
@@ -270,14 +217,6 @@ 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() {