SPECS: relup.sh - use %define _rel if available

glen glen at pld-linux.org
Fri Dec 2 17:08:36 CET 2005


Author: glen                         Date: Fri Dec  2 16:08:36 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %define _rel if available

---- Files affected:
SPECS:
   relup.sh (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/relup.sh
diff -u SPECS/relup.sh:1.2 SPECS/relup.sh:1.3
--- SPECS/relup.sh:1.2	Wed Oct  5 22:09:40 2005
+++ SPECS/relup.sh	Fri Dec  2 17:08:31 2005
@@ -9,17 +9,21 @@
 
 get_dump() {
 	local specfile="$1"
-	rpm --specfile "$specfile" --define 'prep %dump'  -q 2>&1
+	rpm --specfile "$specfile" --define 'prep %dump' -q 2>&1
 }
 
 get_release() {
-	awk '/PACKAGE_RELEASE/{print $NF; exit}'
+	local specfile="$1"
+	rel=$(awk '/^%define.*_rel/{print $NF}' $specfile)
+	if [ -z "$rel" ]; then
+		rel=$(get_dump "$specfile" | awk '/PACKAGE_RELEASE/{print $NF; exit}')
+	fi
+	echo $rel
 }
 
-
 tmpd=$(mktemp -d "${TMPDIR:-/tmp}/relXXXXXX")
 for spec in "$@"; do
-	rel=$(get_dump "$spec" | get_release)
+	rel=$(get_release "$spec")
 	echo "$spec" >> "$tmpd/$rel"
 done
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/relup.sh?r1=1.2&r2=1.3&f=u




More information about the pld-cvs-commit mailing list