From 46dfaab70a2131366d3ac6b1d93efe5fa7f08186 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 23 Nov 2008 12:51:03 +0000
Subject: [PATCH] Clifford Wolf: 	Fixed scripts/Create-PkgUpdPatch users
 for new syntax

[2008102610523423444] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9173 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/HACKING-HOWTO |  8 ++++----
 package/e17/update-e17.sh              |  2 +-
 package/gnome2/update-gnome.sh         | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Documentation/Developers/HACKING-HOWTO b/Documentation/Developers/HACKING-HOWTO
index f49316595..3667178b2 100644
--- a/Documentation/Developers/HACKING-HOWTO
+++ b/Documentation/Developers/HACKING-HOWTO
@@ -408,10 +408,10 @@ package update patches (after evaluating the output of the
 ./scripts/Check-PkgVersion script). E.g.:
 
 	./scripts/Create-PkgUpdPatch | patch -p1 << EOT
-		automake-1.6.1, bin86-0.16.3, bison-1.35, curl-7.9.6,
-		diffutils-2.8.1, dump-0.4b28, ifhp-3.5.7, net-snmp-4.2.4,
-		ntp-4.1.1, pciutils-2.1.10, sendmail.8.12.3, silo-1.2.5,
-		tree-1.4b2, util-linux-2.11q, whois_4.5.25
+		automake~1.6.1, bin86~0.16.3, bison~1.35, curl~7.9.6,
+		diffutils~2.8.1, dump~0.4b28, ifhp~3.5.7, net-snmp~4.2.4,
+		ntp~4.1.1, pciutils~2.1.10, sendmail~8.12.3, silo~1.2.5,
+		tree~1.4b2, util-linux~2.11q, whois~4.5.25
 	EOT
 
 2.4.10. ./scripts/Create-ErrList
diff --git a/package/e17/update-e17.sh b/package/e17/update-e17.sh
index 9957a15db..d019422aa 100644
--- a/package/e17/update-e17.sh
+++ b/package/e17/update-e17.sh
@@ -4,7 +4,7 @@ echo "Updating packages in the e17 repository to version date $(date --date '-1
 
 for pkg in $(cd package/e17; echo *); do
     if [ -x "package/e17/$pkg" ]; then
-	./scripts/Create-PkgUpdPatch $pkg-$(date --date '-1 day' '+%Y-%m-%d') | patch -p0 -bz.orig
+	./scripts/Create-PkgUpdPatch $pkg~$(date --date '-1 day' '+%Y-%m-%d') | patch -p0 -bz.orig
     fi
 done
 
diff --git a/package/gnome2/update-gnome.sh b/package/gnome2/update-gnome.sh
index 76377903c..169fb8f68 100644
--- a/package/gnome2/update-gnome.sh
+++ b/package/gnome2/update-gnome.sh
@@ -25,6 +25,11 @@ urldesktop="$baseurl/desktop/$major/$major.$rev/sources/"
 urldevtools="$baseurl/devtools/$major/$major.$rev/sources/"
 urlplatform="$baseurl/platform/$major/$major.$rev/sources/"
 
+V() {
+	echo "+ $*" >&2
+	"$@"
+}
+
 create_pkg() {
 	echo "$pkg ($pkgver) is not a rock package yet"
 	echo "creating $pkg package"
@@ -39,7 +44,7 @@ create_pkg() {
 }
 
 for url in $urladmin $urlbindings $urldesktop $urldevtools $urlplatform ; do
-	wget -q -O - $url | \
+	V wget -q -O - $url | \
 	sed -n '/id="body"/,/\/div/{/tar.bz2/p}' | \
 	sed -r 's/^.*href="([^"]*).tar.bz2".*$/\1/' | \
 	tr 'A-Z' 'a-z' | \
@@ -51,7 +56,7 @@ for url in $urladmin $urlbindings $urldesktop $urldevtools $urlplatform ; do
 			if [ $dry = 1 ] ; then
 				echo $pkg-$pkgver
 			else
-				./scripts/Create-PkgUpdPatch $pkg-$pkgver | \
+				V ./scripts/Create-PkgUpdPatch $pkg~$pkgver | \
 				patch -p0
 			fi
 # 		else
@@ -70,13 +75,13 @@ while IFS=":" read pkg download; do
 	read dtag cksum file durl < <(echo $download)
 	durl="${durl%/}" ; durl="${durl%/*}"
 
-	wget -q -O - $durl | \
+	V wget -q -O - $durl | \
 	sed -n -e 's,.*href="\([0-9.].*\)".*,\1,gp' | \
 	tail -n1 | \
 	while read newmajor ; do
 		url="$durl/$newmajor"
 
-		wget -q -O - $url | \
+		V wget -q -O - $url | \
 		sed -n -e"s,.*\(LATEST-IS-[^<]*\).*,\1,gp" | \
 		while read newver; do
 			pkgver="${newver#LATEST-IS-}"
@@ -85,7 +90,7 @@ while IFS=":" read pkg download; do
 				if [ $dry = 1 ] ; then
 					echo $pkg-$pkgver
 				else
-					./scripts/Create-PkgUpdPatch $pkg-$pkgver | \
+					V ./scripts/Create-PkgUpdPatch $pkg~$pkgver | \
 					patch -p0
 				fi
 # 			else