SPECS: builder - sort SOURCES/PATCHES by their number from spec

glen glen at pld-linux.org
Mon Dec 8 13:34:54 CET 2008


Author: glen                         Date: Mon Dec  8 12:34:54 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sort SOURCES/PATCHES by their number from spec

---- Files affected:
SPECS:
   builder (1.566 -> 1.567) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.566 SPECS/builder:1.567
--- SPECS/builder:1.566	Mon Nov  3 17:24:09 2008
+++ SPECS/builder	Mon Dec  8 13:34:48 2008
@@ -560,14 +560,14 @@
 	cache_rpm_dump
 
 	if [ "$NOSRCS" != "yes" ]; then
-		SOURCES=$(rpm_dump | awk '/SOURCEURL[0-9]+/ {print $3}')
+		SOURCES=$(rpm_dump | awk '$2 ~ /^SOURCEURL[0-9]+/ {print substr($2, length("SOURCEURL") + 1), $3}' | LC_ALL=C sort -n | awk '{print $2}')
 	fi
 
 	if (rpm_dump | grep -qEi ":.*nosource.*1"); then
 		FAIL_IF_NO_SOURCES="no"
 	fi
 
-	PATCHES=$(rpm_dump | awk '/PATCHURL[0-9]+/ {print $3}')
+	PATCHES=$(rpm_dump | awk '$2 ~ /^PATCHURL[0-9]+/ {print substr($2, length("PATCHURL") + 1), $3}' | LC_ALL=C sort -n | awk '{print $2}')
 	ICONS=$(awk '/^Icon:/ {print $2}' ${SPECFILE})
 	PACKAGE_NAME=$(rpm_dump | awk '$2 == "PACKAGE_NAME" { print $3; exit}')
 	PACKAGE_VERSION=$(rpm_dump | awk '$2 == "PACKAGE_VERSION" { print $3; exit}')
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/builder?r1=1.566&r2=1.567&f=u



More information about the pld-cvs-commit mailing list