From 5267b24c7cc0fc262d026d1374c9abb04202f516 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sat, 12 Mar 2011 14:40:00 +0000
Subject: [PATCH] - merge from HEAD

Changed files:
    percona.sh -> 1.7.2.3
---
 percona.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/percona.sh b/percona.sh
index 0be1e9e..93bd1b4 100644
--- a/percona.sh
+++ b/percona.sh
@@ -19,6 +19,8 @@ filter_files() {
 	filterdiff -x '*/configure'
 }
 
+set -e
+
 if [ -d $version ]; then
 	cd $version
 	bzr pull
@@ -31,7 +33,12 @@ fi
 > .patch.spec
 i=100
 for patch in $(cat $version/series | filter_names); do
-	file=mysql-$patch
+	# if patch already existed, use mysql- prefix
+	if [ -f mysql-$patch ]; then
+		file=mysql-$patch
+	else
+		file=$patch
+	fi
 	cat $version/$patch | filter_files > $file
 
 	if [ -z "$(awk -vfile=$file -F/ '$2 == file{print}' CVS/Entries)" ]; then
@@ -39,8 +46,12 @@ for patch in $(cat $version/series | filter_names); do
 		${branch:+cvs up -r $branch $file}
 	fi
 
-	echo >&2 "Adding: $patch"
-	printf "Patch%d:\t%s\n" $i %{name}-$patch >> .percona.spec
+	if [ "$patch" != "$file" ]; then
+		echo >&2 "Adding: $file ($patch)"
+	else
+		echo >&2 "Adding: $file"
+	fi
+	printf "Patch%d:\t%s\n" $i $(echo "$file" | sed -e 's,^mysql-,%{name}-,') >> .percona.spec
 	printf "%%patch%d -p1\n" $i >> .patch.spec
 	i=$((i+1))
 done
-- 
2.44.0