# shell aliases and functions for PLD Developer
-# $Id$
# set $dist, used by functions below
[ -n "$dist" ] || dist=$(awk '/PLD Linux/ {print tolower($NF)}' /etc/pld-release 2>/dev/null | tr -d '()')
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"
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 pear test packages
+ ignore="$ignore php-*-tests"
+ # obsoleted
+ ignore="$ignore nmap-X11"
+ # mksd dependency not distributale
+ ignore="$ignore samba-vfs-vscan-mks"
+ # ibbackup is not distributale
+ 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"
+
for a in $ignore; do
args="$args --ignore=$a"
done
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
autotag() {
- local out
- for a in "$@"; do
- s=${a%.spec}.spec
- out=$(cvs status -v $s | awk "!/Sticky/&&/auto-$dist-/{if (!a++) print \$1}")
+ local out s
+ for s in "$@"; do
+ # strip branches
+ 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"
done
}
-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
+get-buildlog() {
+ local p=$1
+ if [ -z "$p" ]; then
+ echo >&2 "Usage: get-buildlog PACKAGE"
+ echo >&2 ""
+ echo >&2 "Grabs buildlogs from pld builder for all arch."
+ return
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"
+ local archlist
+ case "$dist" in
+ ac)
+ archlist='i686 i586 i386 athlon alpha sparc amd64 ppc'
+ ;;
+ th)
+ archlist='x86_64 i486 i686'
+ ;;
+ *)
+ echo >&2 "get-buildlog: $dist buildlogs are /dev/null"
+ return
+ esac
- 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
+ local url arch path ftp=ftp://buildlogs.pld-linux.org
+ for arch in $archlist; do
+ [ "$arch" ] || continue
+ path=${url#$ftp}
+ echo -n "Checking $p.$arch... "
+ url=$(lftp -c "debug 0;open $ftp; cls --sort=date -r /$dist/$arch/OK/$p,*.bz2 /$dist/$arch/FAIL/$p,*.bz2 | tail -n1")
+ url=$ftp$url
+
+ echo -n "$url... "
+ if wget -q $url -O .$p~; then
+ echo "OK"
+ mv -f .$p~ $p.$arch.bz2
+ else
+ echo "SKIP"
+ rm -f .$p~
+ fi
+ done
}
-# 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"
+fi # no $dist set
- if [ -t 1 ]; then
- wget "$url" -O -| tee m.patch | diffcol
- else
- wget "$url" -O -
- fi
-}
+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'"
# merges two patches
# requires: patchutils
dif() {
if [ -t 1 ]; then
- diff -ur "$@" | diffcol | less -R
+ diff -ur -x .svn -x .git -x .bzr -x CVS "$@" | diffcol | less -R
else
- diff -ur "$@"
+ diff -ur -x .svn -x .git -x .bzr -x CVS "$@"
fi
}
s,^@@ ,\e[33m&,;
s,^-,\e[35m&,;
s,^+,\e[36m&,;
- s,\r,\e[44m^M\e[49m,g;
+ s,\r,\e[44m^M\e[49m,g;
s, , ,g;
s,\([^[:space:]]\)\([[:space:]]\+\)$,\1\e[41m\2\e[49m,g;
s,$,\e[0m,
-' "$@"
-}
-
-# chdir to file location and do 'cvs log'
-cvslog() {
- local f="$1"
- local d="${f%/*}"
- [ "$d" = "$f" ] && d=.
- (builtin cd $d && cvs log ${f##*/})
+' ${1:+"$@"}
}
-# does diff between FILE and FILE~
+# 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=.
(builtin cd "$dir"; dif $diff{~,})
}
+
+rpmb() {
+ local SPEC SPECDIR arg
+ for arg in "$@"; do
+ case "$arg" in
+ *.spec) SPEC="$arg"
+ ;;
+ esac
+ done
+ SPECDIR=$(dirname "$(pwd)/${SPEC:-.}")
+ command rpmbuild --define "_specdir $SPECDIR" --define "_sourcedir $SPECDIR" "$@"
+}
projects / packages / rpm-build-macros.git / blobdiff