Merge lp:~percona-core/percona-xtrabackup/release-2.2.1-alpha1 into lp:percona-xtrabackup/2.2

[Tomislav Plavcic]

Release 2.2.1-alpha1

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'XB_VERSION'
--- XB_VERSION	2014-03-21 13:05:10 +0000
+++ XB_VERSION	2014-05-07 06:34:56 +0000
@@ -1,4 +1,4 @@
 XB_VERSION_MAJOR=2
 XB_VERSION_MINOR=2
-XB_VERSION_PATCH=0
-XB_VERSION_EXTRA=
+XB_VERSION_PATCH=1
+XB_VERSION_EXTRA=-alpha1

=== modified file 'storage/innobase/xtrabackup/utils/build-binary.sh'
--- storage/innobase/xtrabackup/utils/build-binary.sh	2014-03-05 07:13:02 +0000
+++ storage/innobase/xtrabackup/utils/build-binary.sh	2014-05-07 06:34:56 +0000
@@ -83,8 +83,9 @@
 XTRABACKUP_VERSION="${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}.${XB_VERSION_PATCH}${XB_VERSION_EXTRA}"
 
 # Build information
-REVISION="$(cd "$SOURCEDIR"; bzr revno 2>/dev/null || cat REVNO)"
-
+if [ -z "${REVISION:-}" ]; then
+  REVISION="$(cd "$SOURCEDIR"; bzr revno 2>/dev/null || cat REVNO)"
+fi
 # Compilation flags
 export CC=${CC:-gcc}
 export CXX=${CXX:-g++}
@@ -94,7 +95,7 @@
 
 # Create a temporary working directory
 BASEINSTALLDIR="$(cd "$WORKDIR" && TMPDIR="$WORKDIR_ABS" mktemp -d xtrabackup-build.XXXXXX)"
-INSTALLDIR="$WORKDIR_ABS/$BASEINSTALLDIR/percona-xtrabackup-$XTRABACKUP_VERSION-`uname -s`-`arch`"   # Make it absolute
+INSTALLDIR="$WORKDIR_ABS/$BASEINSTALLDIR/percona-xtrabackup-$XTRABACKUP_VERSION-$(uname -s)-$(uname -m)"   # Make it absolute
 
 mkdir "$INSTALLDIR"
 
@@ -108,7 +109,9 @@
 
         # Install the files
         mkdir -p "$INSTALLDIR"
-        cmake -DBUILD_CONFIG=xtrabackup_release  -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" . && make $MAKE_JFLAG
+        cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" \
+          -DINSTALL_MYSQLTESTDIR=percona-xtrabackup-${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}-test . 
+        make $MAKE_JFLAG
         make install
 
     )
@@ -116,13 +119,13 @@
 
     if test "x$exit_value" = "x0"
     then
-        $TAR czf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION-`uname -s`-`arch`.tar.gz" \
+      $TAR czf "percona-xtrabackup-$XTRABACKUP_VERSION-$REVISION-$(uname -s)-$(uname -m).tar.gz" \
             --owner=0 --group=0 -C "$INSTALLDIR/../" \
-            "percona-xtrabackup-$XTRABACKUP_VERSION-`uname -s`-`arch`"
+            "percona-xtrabackup-$XTRABACKUP_VERSION-$(uname -s)-$(uname -m)"
     fi
 
     # Clean up build dir
-    rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION-`uname -s`-`arch`"
+    rm -rf "percona-xtrabackup-$XTRABACKUP_VERSION-$(uname -s)-$(uname -m)"
     
     exit $exit_value
     

=== modified file 'storage/innobase/xtrabackup/utils/build-dpkg.sh'
--- storage/innobase/xtrabackup/utils/build-dpkg.sh	2014-03-05 07:13:02 +0000
+++ storage/innobase/xtrabackup/utils/build-dpkg.sh	2014-05-07 06:34:56 +0000
@@ -94,12 +94,12 @@
         make DUMMY="$DUMMY" dist
     # Create the original tarball
         mv "${TMPDIR}/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz" \
-        "$WORKDIR/percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
+        "$WORKDIR/percona-xtrabackup-${XB_VERSION_MAJOR}${XB_VERSION_MINOR}_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz"
         rm -fr ${TMPDIR}
     #
         cd "$WORKDIR"
         rm -fr percona-xtrabackup-$XTRABACKUP_VERSION
-        tar xzf percona-xtrabackup_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz
+        tar xzf percona-xtrabackup-${XB_VERSION_MAJOR}${XB_VERSION_MINOR}_$XTRABACKUP_VERSION-$REVISION.orig.tar.gz
         cd percona-xtrabackup-$XTRABACKUP_VERSION
         cp -a storage/innobase/xtrabackup/utils/debian .
 

=== modified file 'storage/innobase/xtrabackup/utils/build-rpm.sh'
--- storage/innobase/xtrabackup/utils/build-rpm.sh	2014-03-05 07:13:02 +0000
+++ storage/innobase/xtrabackup/utils/build-rpm.sh	2014-05-07 06:34:56 +0000
@@ -26,68 +26,68 @@
 # Check if we have got a functional getopt(1)
 if ! getopt --test
 then
-    go_out="$(getopt --options="iKtn" --longoptions=i686,nosign,test,dummy \
-        --name="$(basename "$0")" -- "$@")"
-    test $? -eq 0 || exit 1
-    eval set -- $go_out
+  go_out="$(getopt --options="iKtn" --longoptions=i686,nosign,test,dummy \
+  --name="$(basename "$0")" -- "$@")"
+  test $? -eq 0 || exit 1
+  eval set -- $go_out
 fi
 
 for arg
 do
-    case "$arg" in
+  case "$arg" in
     -- ) shift; break;;
     -i | --i686 )
-        shift
-        TARGET="--target i686"
-        TARGET_CFLAGS="-m32 -march=i686"
-        TARGET_ARG='i686'
-        ;;
+    shift
+    TARGET="--target i686"
+    TARGET_CFLAGS="-m32 -march=i686"
+    TARGET_ARG='i686'
+    ;;
     -K | --nosign )
-        shift
-        SIGN=''
-        ;;
+    shift
+    SIGN=''
+    ;;
     -t | --test )
-        shift
-        TEST='yes'
-        ;;
+    shift
+    TEST='yes'
+    ;;
     -n | --dummy )
-        shift
-        DUMMY='--define=dummy=1'
-        ;;
-    esac
+    shift
+    DUMMY='--define=dummy=1'
+    ;;
+  esac
 done
 
 # Working directory
 if test "$#" -eq 0
 then
-    WORKDIR="$(pwd)"
-
-    # Check that the current directory is not empty
-    if test "x$(echo *)" != "x*"
-    then
-        echo >&2 \
-            "Current directory is not empty. Use $0 . to force build in ."
-        exit 1
-    fi
-
-    WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
+  WORKDIR="$(pwd)"
+
+  # Check that the current directory is not empty
+  if test "x$(echo *)" != "x*"
+  then
+    echo >&2 \
+    "Current directory is not empty. Use $0 . to force build in ."
+    exit 1
+  fi
+
+  WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
 
 elif test "$#" -eq 1
 then
-    WORKDIR="$1"
-
-    # Check that the provided directory exists and is a directory
-    if ! test -d "$WORKDIR"
-    then
-        echo >&2 "$WORKDIR is not a directory"
-        exit 1
-    fi
-
-    WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
+  WORKDIR="$1"
+
+  # Check that the provided directory exists and is a directory
+  if ! test -d "$WORKDIR"
+  then
+    echo >&2 "$WORKDIR is not a directory"
+    exit 1
+  fi
+
+  WORKDIR_ABS="$(cd "$WORKDIR"; pwd)"
 
 else
-    echo >&2 "Usage: $0 [target dir]"
-    exit 1
+  echo >&2 "Usage: $0 [target dir]"
+  exit 1
 
 fi
 
@@ -101,17 +101,20 @@
 
 # Build information
 REDHAT_RELEASE="$(grep -o 'release [0-9][0-9]*' /etc/redhat-release | \
-    cut -d ' ' -f 2)"
-REVISION="$(cd "$SOURCEDIR"; (bzr revno 2>/dev/null || cat REVNO))"
+cut -d ' ' -f 2)"
+
+if [ -z "${REVISION:-}" ]; then
+  REVISION="$(cd "$SOURCEDIR"; (bzr revno 2>/dev/null || cat REVNO))"
+fi
 
 # Fix problems in rpmbuild for rhel4: _libdir and _arch are not correctly set.
 if test "x$REDHAT_RELEASE" == "x4" && test "x$TARGET_ARG" == "xi686"
 then
-    TARGET_LIBDIR='--define=_libdir=/usr/lib'
-    TARGET_ARCH='--define=_arch=i386'
+  TARGET_LIBDIR='--define=_libdir=/usr/lib'
+  TARGET_ARCH='--define=_arch=i386'
 else
-    TARGET_LIBDIR=''
-    TARGET_ARCH=''
+  TARGET_LIBDIR=''
+  TARGET_ARCH=''
 fi
 
 # Compilation flags
@@ -124,23 +127,33 @@
 export MYSQL_RPMBUILD_TEST="$TEST"
 
 (
-    cd "$WORKDIR"
-
-    mkdir -p BUILD SOURCES RPMS SRPMS
-
-    # Create the source archive
-    (cd "$SOURCEDIR"; cmake .; make DUMMY="$DUMMY" dist)
-
-    cp $SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz SOURCES/
-    cp $SOURCEDIR/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec SPECS/
-
-    # Issue RPM command
-    rpmbuild $SIGN $TARGET $TARGET_LIBDIR $TARGET_ARCH $DUMMY \
-        -ba --clean SPECS/percona-xtrabackup.spec \
-        --define "_topdir $WORKDIR_ABS" \
-        --define "xtrabackup_version $XTRABACKUP_VERSION" \
-        --define "xtrabackup_revision $REVISION" \
-        --define "redhat_version $REDHAT_RELEASE" \
-        --define "buildnumber $REVISION"
+cd "$WORKDIR"
+
+mkdir -p BUILD SOURCES RPMS SRPMS SPECS
+
+# Create the source archive
+(cd "$SOURCEDIR"; cmake .; make DUMMY="$DUMMY" dist)
+
+cp $SOURCEDIR/percona-xtrabackup-$XTRABACKUP_VERSION.tar.gz SOURCES/
+cp $SOURCEDIR/storage/innobase/xtrabackup/utils/percona-xtrabackup.spec SPECS/
+#
+if [ -z "${XB_VERSION_EXTRA:-}" ]; then
+  EXTRAVER="%{nil}"
+  RPM_EXTRAVER=1
+else 
+  EXTRAVER=${XB_VERSION_EXTRA}
+  RPM_EXTRAVER=.${XB_VERSION_EXTRA#-}
+fi
+#
+
+sed -i "s:@@XB_VERSION_EXTRA@@:${EXTRAVER}:g" SPECS/percona-xtrabackup.spec
+sed -i "s:@@XB_RPM_VERSION_EXTRA@@:${RPM_EXTRAVER}:g" SPECS/percona-xtrabackup.spec
+sed -i "s:@@XB_VERSION_MAJOR@@:${XB_VERSION_MAJOR}:g" SPECS/percona-xtrabackup.spec
+sed -i "s:@@XB_VERSION_MINOR@@:${XB_VERSION_MINOR}:g" SPECS/percona-xtrabackup.spec
+sed -i "s:@@XB_VERSION_PATCH@@:${XB_VERSION_PATCH}:g" SPECS/percona-xtrabackup.spec
+sed -i "s:@@XB_REVISION@@:${REVISION}:g" SPECS/percona-xtrabackup.spec
+
+# Issue RPM command
+rpmbuild --define "_topdir ${WORKDIR_ABS}" $SIGN $TARGET $TARGET_LIBDIR $TARGET_ARCH $DUMMY -ba --clean SPECS/percona-xtrabackup.spec 
 
 )

=== modified file 'storage/innobase/xtrabackup/utils/debian/changelog'
--- storage/innobase/xtrabackup/utils/debian/changelog	2014-03-11 15:24:27 +0000
+++ storage/innobase/xtrabackup/utils/debian/changelog	2014-05-07 06:34:56 +0000
@@ -1,96 +1,7 @@
-percona-xtrabackup (2.1.8-1) unstable; urgency=low
-
-  * Update to new upstream release Percona XtraBackup 2.1.8
-
- -- Tomislav Plavcic <[e-mail]>  Tue, 11 Mar 2014 16:22:36 +0100
-
-percona-xtrabackup (2.1.7-1) unstable; urgency=low
-  
-  * Update to new upstream release Percona XtraBackup 2.1.7
-
- -- Alexey Bychko <[e-mail]>  Mon, 20 Dec 2013 19:31:00 +0700
-
-percona-xtrabackup (2.1.6-3) unstable; urgency=low
-
-  [ Stewart Smith ]
-  * Add lsb-base as build dependency to fix URL generation in --help
-  * Add Enhances: mysql-server
-
-  [ Clint Byrum ]
-  * Bumped standards version to 3.9.5 - No changes necessary.
-
- -- Stewart Smith <[e-mail]>  Wed, 11 Dec 2013 12:00:29 +1100
-
-percona-xtrabackup (2.1.6-2) unstable; urgency=low
-
-  * Update to new upstream release Percona XtraBackup 2.1.6
-  * Integrate packaging updates from upstream and Debian.
-
- -- Stewart Smith <[e-mail]>  Wed, 27 Nov 2013 15:15:17 +1100
-
-percona-xtrabackup (2.1.5-1) unstable; urgency=low
-
-  * Update to new upstream release Percona XtraBackup 2.1.5
-
- -- Stewart Smith <[e-mail]>  Tue, 29 Oct 2013 14:56:54 +1100
-
-percona-xtrabackup (2.1.3-618-1) unstable; urgency=low
-
-  [ Stewart Smith ]
-  * Initial packaging for Debian (Closes: #620824)
-
-  [ Clint Byrum ]
-  * Remove inaccurate Vcs-* fields.
-  * Remove MAKE_J setting as it is handled by dpkg build tools.
-  * Remove unnecesssary debian/percona-xtrabackup.dirs
-  * Updating standards to 3.9.4, no changes necessary.
-  * Add embedded-library libmysqlclient to
-    percona-xtrabackup.lintian-overrides.
-
- -- Stewart Smith <[e-mail]>  Fri, 19 Jul 2013 16:18:36 +1000
-
-percona-xtrabackup (2.1.0) unstable; urgency=low
-
-  * Update compat level to 7
-  * Update Standards-Version to 3.9.1.
-  * Use dh targets and overrides.
-  * Remove the obsolete debian/info file
-  * Move the /usr/share/percona-xtrabackup-test directory to
-    the percona-xtrabackup-test package.
-  * Update the copyright file to a machine-readable format.
-
- -- Ignacio Nin <[e-mail]>  Mon, 22 Apr 2013 16:14:20 -0300
-
-percona-xtrabackup (2.0.0) lucid; urgency=low
-
-  * General polishing of debian/ directory
-  * Add correct copyright info
-  * Move rules for installing files (binaries and test) from rules to
-    .install and .links files
-  * Create per-package .dirs and .docs files
-  * Add a lintian-overrides files
-
- -- Ignacio Nin <[e-mail]>  Wed, 18 Apr 2012 02:34:40 +0000
-
-percona-xtrabackup (1.9.1) unstable; urgency=low
-
-  * Change package name to percona-xtrabackup
-
- -- Ignacio Nin <[e-mail]>  Wed, 14 Mar 2012 16:52:34 -0300
-
-xtrabackup (1.2) unstable; urgency=low
-
-  * XtraBackup is based on XtraDB 10
-
- -- Aleksandr Kuzminsky <[e-mail]>  Wed, 07 Mar 2010 23:45:00 +0200
-xtrabackup (1.1) unstable; urgency=low
-
-  * XtraBackup is ported to InnoDB plugin
-
- -- Aleksandr Kuzminsky <[e-mail]>  Mon, 15 Mar 2010 07:00:00 +0200
-xtrabackup (1.0) unstable; urgency=low
-
-  * Initial release
-
- -- Alex <[e-mail]>  Sun, 28 Jun 2009 14:20:17 -0700
+percona-xtrabackup-22 (2.2.1) unstable; urgency=low
+
+  * Update to new upstream alpha Percona XtraBackup 2.2.1
+
+ -- Alexey Bychko <[e-mail]>  Thu, 27 Mar 2014 16:54:36 +0700
+
 

=== modified file 'storage/innobase/xtrabackup/utils/debian/control'
--- storage/innobase/xtrabackup/utils/debian/control	2014-03-05 07:13:02 +0000
+++ storage/innobase/xtrabackup/utils/debian/control	2014-05-07 06:34:56 +0000
@@ -1,4 +1,4 @@
-Source: percona-xtrabackup
+Source: percona-xtrabackup-22
 Section: database
 Priority: extra
 Maintainer: Debian MySQL Maintainers <[e-mail]>
@@ -18,7 +18,7 @@
 Standards-Version: 3.9.5
 Homepage: http://www.percona.com/software/percona-xtrabackup
 
-Package: percona-xtrabackup
+Package: percona-xtrabackup-22
 Architecture: any
 Depends: libdbd-mysql-perl, ${misc:Depends}, ${shlibs:Depends}
 Provides: xtrabackup
@@ -31,27 +31,28 @@
  InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server 5.1 and
  5.5 servers, and has many advanced features.
 
-Package: percona-xtrabackup-dbg
+Package: percona-xtrabackup-22-dbg
 Section: debug
 Architecture: any
-Depends: percona-xtrabackup (= ${binary:Version}), ${misc:Depends}
+Depends: percona-xtrabackup-22 (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for Percona XtraBackup
  Debug symbols for the binaries in percona-xtrabackup. Install this
  package if you need to run any of those with gdb.
 
-Package: percona-xtrabackup-test
+Package: percona-xtrabackup-22-test
 Architecture: any
-Depends: mysql-client, percona-xtrabackup, python, ${misc:Depends}
+Depends: mysql-client, percona-xtrabackup-22, python, ${misc:Depends}
 Description: Test suite for Percona XtraBackup
  Test suite for Percona XtraBackup. Install this package if you intend
  to run XtraBackup's test suite.
 
-Package: xtrabackup
+Package: xtrabackup-22
 Architecture: all
 Section: oldlibs
-Depends: percona-xtrabackup, ${misc:Depends}
+Depends: percona-xtrabackup-22, ${misc:Depends}
 Description: Transitional package for percona-xtrabackup
- In 2.0.0, the XtraBackup package name was rebranded to
+ In 2.2.x, the XtraBackup package name was rebranded to
  percona-xtrabackup. This package is an empty dummy package
  that depends on percona-xtrabackup, and replaces older versions of
  xtrabackup (2.0.0). It is not intended to be installed manually.
+

=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-22-test.install'
--- storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.install	2014-03-05 07:13:02 +0000
+++ storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-22-test.install	2014-05-07 06:34:56 +0000
@@ -1,1 +1,1 @@
-/usr/share/percona-xtrabackup-test
+/usr/share/percona-xtrabackup-22-test

=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-test.lintian-overrides' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-22-test.lintian-overrides'
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.docs' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-22.docs'
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-22.install'
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.links' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-22.links'
=== renamed file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.lintian-overrides' => 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-22.lintian-overrides'
=== modified file 'storage/innobase/xtrabackup/utils/debian/rules'
--- storage/innobase/xtrabackup/utils/debian/rules	2014-03-05 07:13:02 +0000
+++ storage/innobase/xtrabackup/utils/debian/rules	2014-05-07 06:34:56 +0000
@@ -3,6 +3,7 @@
 
 #export DH_VERBOSE=1
 
+NCPU=$(shell grep -c processor /proc/cpuinfo)
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -16,12 +17,9 @@
 
 override_dh_auto_configure:
 
-
-override_dh_auto_build:
-
 ifeq "$(DEB_DUMMY)" ""
 	cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test .
+	  -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-22-test .
 else
 	# Dummy binaries that avoid compilation
 	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup
@@ -32,9 +30,11 @@
 endif
 
 	#docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
+override_dh_auto_build:
+	make -j$(NCPU)
 
 override_dh_strip:
-	dh_strip --dbg-package=percona-xtrabackup-dbg
+	dh_strip --dbg-package=percona-xtrabackup-22-dbg
 
 %:
 	dh $@

=== modified file 'storage/innobase/xtrabackup/utils/percona-xtrabackup.spec'
--- storage/innobase/xtrabackup/utils/percona-xtrabackup.spec	2014-03-21 13:02:28 +0000
+++ storage/innobase/xtrabackup/utils/percona-xtrabackup.spec	2014-05-07 06:34:56 +0000
@@ -1,93 +1,84 @@
-#
-# rpm spec for xtrabackup
-#
-%{!?redhat_version:%define redhat_version 5}
-%{!?buildnumber:%define buildnumber 1}
-%define distribution  el%{redhat_version}
-%define release       %{buildnumber}.%{distribution}
-%{!?xtrabackup_revision:%define xtrabackup_revision undefined}
-
-%define __os_install_post /usr/lib/rpm/brp-compress
-
-Summary: XtraBackup online backup for MySQL / InnoDB 
-Name: percona-xtrabackup
-Version: %{xtrabackup_version}
-Release: %{release}
-Group: Server/Databases
-License: GPLv2
-Packager: Percona Development Team <[e-mail]>
-URL: http://www.percona.com/software/percona-xtrabackup/
-Source: percona-xtrabackup-%{xtrabackup_version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Provides: xtrabackup
-Obsoletes: xtrabackup
-BuildRequires: libaio-devel, libgcrypt-devel
-Requires: perl(DBD::mysql)
+%define xb_version_major  @@XB_VERSION_MAJOR@@
+%define xb_version_minor  @@XB_VERSION_MINOR@@
+%define xb_version_patch  @@XB_VERSION_PATCH@@
+%define xb_version_extra  @@XB_VERSION_EXTRA@@
+%define xb_rpm_version_extra @@XB_RPM_VERSION_EXTRA@@
+%define xb_revision       @@XB_REVISION@@
+
+#####################################
+Name:           percona-xtrabackup-%{xb_version_major}%{xb_version_minor}
+Version:        %{xb_version_major}.%{xb_version_minor}.%{xb_version_patch}
+Release:        %{xb_revision}%{xb_rpm_version_extra}%{?dist}
+Summary:        XtraBackup online backup for MySQL / InnoDB
+
+Group:          Applications/Databases
+License:        GPLv2
+URL:            http://www.percona.com/software/percona-xtrabackup
+Source:         percona-xtrabackup-%{version}%{xb_version_extra}.tar.gz
+
+BuildRequires:  cmake, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel
+Requires:       perl(DBD::mysql)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 %description
-Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines.
-
-%package test
-Summary: Test suite for Percona Xtrabackup
-Group: Applications/Databases
-Requires: percona-xtrabackup
-AutoReqProv: no
-Requires: /usr/bin/mysql
-
-%description test
-This package contains the test suite for Percona Xtrabackup
-
-
-%changelog
-
+Percona XtraBackup is OpenSource online (non-blockable) backup solution for InnoDB and XtraDB engines
+
+%package -n percona-xtrabackup-test-%{xb_version_major}%{xb_version_minor}
+Summary:        Test suite for Percona XtraBackup
+Group:          Applications/Databases
+Requires:       percona-xtrabackup-%{xb_version_major}%{xb_version_minor} = %{version}-%{release}
+Requires:       /usr/bin/mysql
+AutoReqProv:    no
+
+%description -n percona-xtrabackup-test-%{xb_version_major}%{xb_version_minor}
+This package contains the test suite for Percona XtraBackup %{version}
 
 %prep
-%setup -q
+%setup -q -n percona-xtrabackup-%{version}%{xb_version_extra}
 
+%bcond_with dummy
 
 %build
-set -ue
-%if %{undefined dummy}
-export CC=${CC-"gcc"}
-export CXX=${CXX-"g++"}
-export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 
-export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 
 #
-
-cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DINSTALL_MYSQLTESTDIR=%{_datadir}/percona-xtrabackup-test .
-%{__make} %{?_smp_mflags}
-
-%else
+%if %{with dummy}
 # Dummy binaries that avoid compilation
 echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xtrabackup
 echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xbstream
 echo 'main() { return 300; }' | gcc -x c - -o storage/innobase/xtrabackup/src/xbcrypt
+#
+%else
+#
+export CC=${CC-"gcc"}
+export CXX=${CXX-"g++"}
+export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
+export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
+#
+cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+  -DINSTALL_MYSQLTESTDIR=%{_datadir}/percona-xtrabackup-test-%{xb_version_major}%{xb_version_minor} .
+#
+make %{?_smp_mflags}
+#
 %endif
-
+#
 %install
-[ "%{buildroot}" != '/' ] && rm -rf %{buildroot}
-
-%makeinstall
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
-[ "%{buildroot}" != '/' ] && rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/innobackupex
 %{_bindir}/xtrabackup
 %{_bindir}/xbstream
 %{_bindir}/xbcrypt
 %doc COPYING
 
-%files -n percona-xtrabackup-test
-%{_datadir}/percona-xtrabackup-test
-
-###
-### eof
-###
-
-
+%files -n percona-xtrabackup-test-%{xb_version_major}%{xb_version_minor}
+%defattr(-,root,root,-)
+%{_datadir}/percona-xtrabackup-test-%{xb_version_major}%{xb_version_minor}
+
+%changelog
+* Wed Mar 26 2014 Alexey Bychko <[e-mail]>
+- initial alpha release for 2.2 (2.2.1-alpha1)