From a1c8a55091fbfee45d6b3502f17cae63802d03a7 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Fri, 26 Sep 2003 09:43:35 +0000
Subject: [PATCH] Clifford Wolf <clifford@clifford.at>: the attached patch
 fixes the *.Z to *.bz2 conversion in the Download script. with that patch
 applied it's possible again to e.g. build xfree86 after a fresh download ...

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1492 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-CLIFFORD |  4 ++++
 scripts/Download                            | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-CLIFFORD b/Documentation/Developers/CHANGELOG-CLIFFORD
index 7a53cc1cc..b158adbbf 100644
--- a/Documentation/Developers/CHANGELOG-CLIFFORD
+++ b/Documentation/Developers/CHANGELOG-CLIFFORD
@@ -1,4 +1,8 @@
 
+*) 2003-09-24 (2.0.0-camp - 2.0.0-rc1)
+
+ - Fixed *.Z to *.bz2 conversion in Download script
+
 *) 2003-09-20 (2.0.0-camp - 2.0.0-rc1)
 
  - Added "no broken deps" feature to scripts/Create-PkgQueue
diff --git a/scripts/Download b/scripts/Download
index c17cdfbfe..58340104d 100755
--- a/scripts/Download
+++ b/scripts/Download
@@ -504,7 +504,7 @@ download_file() {
 				  typeexpr="gzip compressed data" ;;
 			      *.bz2|*.tbz2)
 				  typeexpr="bzip2 compressed data" ;;
-			      *.Z)
+			      *.Z|*.tZ)
 				  typeexpr="compress'd data" ;;
 			      *.zip|*.jar)
 				  typeexpr="Zip archive data" ;;
@@ -638,7 +638,7 @@ list() {
 
 list_unknown() {
 	trap '' INT
-	mkdir -p src/ ; list | sed 's,\.\(t\?\)gz$,.\1bz2,' > src/down.$$.lst
+	mkdir -p src/ ; list | sed 's,\.\(t\?\)\(gz\|Z\)$,.\1bz2,' > src/down.$$.lst
 	ls download/{INDEX,README,DOWNTEST,LAST-UPDATE} \
 						>> src/down.$$.lst 2> /dev/null
 	find download/* -type f -o -type l | \
@@ -651,7 +651,7 @@ list_unknown() {
 
 list_missing() {
 	trap '' INT
-	list | sed 's,\.\(t\?\)gz$,.\1bz2,' | \
+	list | sed 's,\.\(t\?\)\(gz\|Z\)$,.\1bz2,' | \
 	while read fn ; do
 		[ -f "$fn" ] || echo "$fn"
 	done
@@ -702,11 +702,13 @@ required() {
 
 single_files() {
     for file_name ; do
-	if ! handle_file "$file_name" ; then
-		file_name="`echo "$file_name" | sed 's,\.\(t\?\)bz2$,.\1gz,'`"
-		if ! handle_file "$file_name" ; then
-			echo "ERROR: Unknown file: $file_name."
-		fi
+	file_name_gz="`echo "$file_name" | sed 's,\.\(t\?\)bz2$,.\1gz,'`"
+	file_name_Z="`echo "$file_name" | sed 's,\.\(t\?\)bz2$,.\1Z,'`"
+	if ! handle_file "$file_name"    && \
+	   ! handle_file "$file_name_gz" && \
+	   ! handle_file "$file_name_Z"
+	then
+		echo "ERROR: Unknown file: $file_name."
 	fi
     done
 }