X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-build.sh;h=a04dc94ea6383e7b6b37c1b44e75ad5e306e0dbc;hb=f5b9833d8ce4403af7bf2d06794f8ae6d0df57e9;hp=6b800aa20168908ec73ef91e17b8201d73ae6608;hpb=32c06dbf3cc407e2f19224ff6cea7220e9ebcc88;p=packages%2Frpm-build-macros.git

diff --git a/rpm-build.sh b/rpm-build.sh
old mode 100644
new mode 100755
index 6b800aa..a04dc94
--- a/rpm-build.sh
+++ b/rpm-build.sh
@@ -1,5 +1,4 @@
 # 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 '()')
@@ -46,12 +45,20 @@ dist-requires() {
 		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"
@@ -78,9 +85,23 @@ dist-verify() {
 		# 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"
+		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 php-pear-Net_Ping-tests"
+		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
@@ -93,14 +114,60 @@ dist-verify() {
 
 # 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
 }
 
+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
+
+	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
+
+	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
+}
+
 fi # no $dist set
 
 alias cv='cvs status -v'
@@ -140,7 +207,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"
@@ -183,9 +250,9 @@ sfget() {
 
 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
 }
 
@@ -197,11 +264,11 @@ sed -e '
 	s,^@@ ,&,;
 	s,^-,&,;
 	s,^+,&,;
-	s,
,^M,g;
+	s,\r,^M,g;
 	s,	,    ,g;
 	s,\([^[:space:]]\)\([[:space:]]\+\)$,\1\2,g;
 	s,$,,
-' "$@"
+' ${1:+"$@"}
 }
 
 # chdir to file location and do 'cvs log'
@@ -212,11 +279,11 @@ cvslog() {
 	(builtin cd $d && cvs log ${f##*/})
 }
 
-# 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=.
@@ -229,3 +296,15 @@ d() {
 
 	(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" "$@"
+}