From: Bartosz Świątek <shadzik@tld-linux.org>
Date: Sat, 7 Jul 2012 17:22:18 +0000 (+0200)
Subject: Merge branch 'master' of git.tld-linux.org:packages/scripts
X-Git-Url: https://git.tld-linux.org/?p=packages%2Frpm-build-tools.git;a=commitdiff_plain;h=b2682b2ed8bbe82d8232d059437e5fbccfc61e9b;hp=d1831029337813879bcd5f45fffb7789dd99456a

Merge branch 'master' of git.tld-linux.org:packages/scripts
---

diff --git a/builder b/builder
index 479a0c2..00a7c99 100755
--- a/builder
+++ b/builder
@@ -1499,16 +1499,16 @@ build_package() {
 			echo ""
 		fi
 		# try to nicely show package list, to just copy&paste it to poldek or so...
-		eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE 2>$BRLISTFILE
-		BRLIST=$(awk 'BEGIN{ORS=" ";} NR>1 {print $1;}' $BRLISTFILE)
-		echo
-		echo "To install packages type:"
-		echo "poldek -ivh $BRLIST"
-		echo
-		echo "In poldek, copy these command:"
-		echo "install $BRLIST"
-		echo
-		rm $BRLISTFILE
+		#eval ${NICE_COMMAND} $RPMBUILD $TARGET_SWITCH $BUILD_SWITCH -v $QUIET $CLEAN $RPMOPTS $RPMBUILDOPTS $BCOND --define \'_specdir $PACKAGE_DIR\' --define \'_sourcedir $PACKAGE_DIR\' $SPECFILE 2>$BRLISTFILE
+		#BRLIST=$(awk 'BEGIN{ORS=" ";} NR>1 {print $1;}' $BRLISTFILE)
+		#echo
+		#echo "To install packages type:"
+		#echo "poldek -ivh $BRLIST"
+		#echo
+		#echo "In poldek, copy these command:"
+		#echo "install $BRLIST"
+		#echo
+		#rm $BRLISTFILE
 		Exit_error err_build_fail
 	fi
 	unset BUILD_SWITCH
diff --git a/relup.sh b/relup.sh
new file mode 100755
index 0000000..1eb79a9
--- /dev/null
+++ b/relup.sh
@@ -0,0 +1,135 @@
+#!/bin/sh
+# script to run after "release bump" style change.
+# takes Release from spec and creates commit with message
+# groups similiar commits together.
+# "- release $rel"
+
+set -e
+
+get_dump() {
+	local specfile="$1"
+	if ! out=$(rpm --specfile "$specfile" --define 'prep %dump' -q 2>&1); then
+		echo >&2 "$out"
+		echo >&2 "You need icon files being present in SOURCES."
+		exit 1
+	fi
+	echo "$out"
+}
+
+usage="Usage:
+${0##*/} [-i] [-u] [-t] [-n] [-m <MESSAGE>] <SPECLIST>
+
+Options:
+-i
+  Try to increment package release
+-u
+  git pull first
+-t | -n
+  Test mode (dry-run). do not commit
+-m
+  Specify commit message
+
+"
+
+get_release() {
+	local specfile="$1"
+	rel=$(awk '/^%define[ 	]+_?rel[ 	]+/{print $NF}' $specfile)
+	if [ -z "$rel" ]; then
+		dump=$(get_dump "$specfile")
+		rel=$(echo "$dump" | awk '/PACKAGE_RELEASE/{print $NF; exit}')
+	fi
+	echo $rel
+}
+
+set_release() {
+	local specfile="$1"
+	local rel="$2"
+	local newrel="$3"
+	sed -i -e "
+		s/^\(%define[ \t]\+_\?rel[ \t]\+\)$rel\$/\1$newrel/
+		s/^\(Release:[ \t]\+\)$rel\$/\1$newrel/
+	" $specfile
+}
+
+if [ ! -x /usr/bin/getopt ]; then
+	echo >&1 "You need to install util-linux to use relup.sh"
+	exit 1
+fi
+
+t=$(getopt -o 'm:inuth' -n "${0##*/}" -- "$@") || exit $?
+# Note the quotes around `$t': they are essential!
+eval set -- "$t"
+
+while true; do
+	case "$1" in
+	-i)
+		inc=1
+		;;
+	-u)
+		update=1
+		;;
+	-t | -n)
+		test=1
+		;;
+	-m)
+		shift
+		message="${1#- }"
+		;;
+	-h)
+		echo "$usage"
+		exit 0
+		;;
+	--)
+		shift
+	   	break
+	;;
+	*)
+	   	echo 2>&1 "Internal error: [$1] not recognized!"
+		exit 1
+	   	;;
+	esac
+	shift
+done
+
+tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
+topdir=$(rpm -E '%{_topdir}')
+cd "$topdir"
+for pkg in "$@"; do
+	name=${pkg%.spec} name=${name##*/}
+	spec=$(rpm -D "name $name" -E '%{_specdir}/%{name}.spec')
+	spec=${spec#$topdir/}
+	if [ "$update" = "1" ]; then
+		./builder -g -ns "$spec"
+	fi
+	rel=$(get_release "$spec")
+	if [ "$inc" = 1 ]; then
+		if [[ $rel = *%* ]]; then
+			relmacro=${rel#*%}
+			relnum=${rel%%%*}
+			newrel=$(expr ${relnum} + 1)
+			set_release "$spec" $rel "${newrel}%${relmacro}"
+		else
+			newrel=$(expr ${rel} + 1)
+			set_release "$spec" $rel $newrel
+		fi
+
+		# refetch release
+		rel=$(get_release "$spec")
+	fi
+	echo "$spec" >> "$tmpd/$rel"
+done
+
+n="$(echo -e '\nn')"
+n="${n%%n}"
+for file in $(ls "$tmpd" 2>/dev/null); do
+	files=$(cat "$tmpd/$file")
+	rel=$(basename "$file")
+	msg=""
+	[ -n "$message" ] && msg="$msg- $message$n"
+	msg="$msg- release ${rel%%%*} (by relup.sh)$n"
+	echo git commit -a -m "'$msg'"
+	if [ "$test" != 1 ]; then
+		git commit -m "$msg" $files
+	fi
+done
+rm -rf $tmpd