- typos

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

diff --git a/rpm-build.sh b/rpm-build.sh
index 10b641cc0787adeb62abab6e149b432f9dfc1e41..f80b2f12f236d20cd2af856dd3c5569d650f25aa 100644 (file)
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -20,9 +20,34 @@ 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
 
+# undo spec utf8
+# note: it will do it blindly, so any lang other than -pl is most likely broken
+specutfundo() {
+       local spec="$1"
+       iconv -futf8 -tlatin2 "$spec" > m
+       sed -e 's/\.UTF-8//' m > "$spec"
+       rm -f m
+}
+
 dist-verify() {
-       poldek --sn $dist --sn $dist-ready --up
-       poldek --sn $dist --sn $dist-ready --verify=deps "$@"
+       case "$dist" in
+       ac)
+               local a ignore
+               # typo
+               ignore="$ignore kdenetwork-kopete-tool-conectionstatus"
+               # obsoleted
+               ignore="$ignore gimp-plugin-swfdec wine-drv-arts ntp-ntptrace"
+               # quake2@MAIN is now quake2forge, original quake2 restored to quake2
+               ignore="$ignore quake2-3dfx quake2-sdl quake2-sgl quake2-snd-alsa quake2-snd-ao quake2-snd-oss quake2-snd-sdl quake2-static"
+
+               for a in $ignore; do
+                       args="$args --ignore=$a"
+               done
+               ;;
+       esac
+
+       poldek --sn $dist --sn $dist-updates --up --upa -q
+       poldek --sn $dist --sn $dist-updates --noignore --verify=deps $args "$@"
 }
 
 # displays latest used tag for a specfile
@@ -57,7 +82,7 @@ urldiff() {
        file=${file##*/}
        local r1=${file#*r1=}
        local r2=${r1#*r2=}
-       r2=${r2%[&;]*}
+       r2=${r2%%[&;]*}
        r1=${r1%%[&;]*}
        file=${file%\?*}
        file=${file%.diff}
@@ -83,8 +108,9 @@ kdediff() {
        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&makepatch=1&diff_format=u"
+       url="$url?r1=$r1&r2=$r2&view=patch"
 
        if [ -t 1 ]; then
                wget "$url" -O -| tee m.patch | diffcol
@@ -105,6 +131,8 @@ pmerge() {
 sfget() {
        local url="$1"
        url="${url%?download}"
+       url="${url%?use_mirror=*}"
+       url="${url#http://downloads.}"
        url="http://dl.${url#http://prdownloads.}"
        # use mirror
        local mirror="http://nchc.dl.sourceforge.net"
@@ -142,3 +170,21 @@ cvslog() {
        [ "$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
+       if [[ "$file" = /* ]]; then
+               # full path -- no idea where to strip
+               dir=.
+               diff=$file
+       else
+               # relative path -- keep one path component from current dir
+               dir=..
+               diff=${PWD##*/}/${file}
+       fi
+
+       (builtin cd "$dir"; dif $diff{~,})
+}