- ignore-builtin-innodb is deprecated

[packages/mysql.git] / percona.sh

diff --git a/percona.sh b/percona.sh
index ddfecd32920ed6784c7f86e5958c27c595f3c69d..722a35a8a904ce1fd99205fc6348d4ed4347938d 100644 (file)
--- a/percona.sh
+++ b/percona.sh
@@ -12,7 +12,6 @@ bzr_branch=lp:percona-server/$version
 branch=
 
 filter_names() {
-       grep -v 'mysql_dump_ignore_ct.patch' | \
        grep -v 'percona-support.patch' | \
        grep -v 'mysqld_safe_syslog.patch' | \
        grep -v 'mysql-test.diff'
@@ -35,14 +34,15 @@ fi
 > .percona.spec
 > .patch.spec
 i=100
-for patch in $(cat $version/series | filter_names); do
+[ -d "$version/patches" ] && dir=$version/patches || dir=$version
+for patch in $(cat $dir/series | filter_names); do
        # 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
+       cat $dir/$patch | filter_files > $file
 
        if [ -z "$(awk -vfile=$file -F/ '$2 == file{print}' CVS/Entries)" ]; then
                cvs add $file