gist_content1

=== modified file 'Percona-Server/cmake/wsrep.cmake'
--- Percona-Server/cmake/wsrep.cmake	2013-03-25 18:31:44 +0000
+++ Percona-Server/cmake/wsrep.cmake	2013-03-28 07:49:48 +0000
@@ -17,7 +17,11 @@
 # so WSREP_VERSION is produced regardless
 
 # Set the patch version
+<<<<<<< TREE
 SET(WSREP_PATCH_VERSION "7.3")
+=======
+SET(WSREP_PATCH_VERSION "7.2")
+>>>>>>> MERGE-SOURCE
 
 # Obtain patch revision number
 SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})

=== modified file 'build/build-rpm.sh'
--- build/build-rpm.sh	2012-11-13 17:26:18 +0000
+++ build/build-rpm.sh	2013-03-28 07:49:48 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Execute this tool to setup and build RPMs for Percona XtraDB Cluster
 # from a fresh tree
@@ -148,13 +148,13 @@
 # Issue rpmbuild command
 (
     cd "$WORKDIR"
-
+    sed -e "s:@@WSREP_VERSION@@:${WSREP_VERSION}:g" \
+    "$SOURCEDIR/build/percona-xtradb-cluster.spec" > \
+    "${WORKDIR_ABS}/SPECS/percona-xtradb-cluster.spec"
     # Issue RPM command
     rpmbuild -ba --clean --with yassl $TARGET $SIGN $QUIET \
-        "$SOURCEDIR/build/percona-xtradb-cluster.spec" \
+        "${WORKDIR_ABS}/SPECS/percona-xtradb-cluster.spec" \
         --define "_topdir $WORKDIR_ABS" \
-        --define "revision $REVISION" \
-        --define "wsrep_version $WSREP_VERSION"
-
+        --define "revision $REVISION" 
 )
 

=== modified file 'build/percona-xtradb-cluster.spec'
--- build/percona-xtradb-cluster.spec	2013-03-25 18:31:44 +0000
+++ build/percona-xtradb-cluster.spec	2013-03-28 07:49:48 +0000
@@ -35,7 +35,9 @@
 %define mysqld_user     mysql
 %define mysqld_group    mysql
 %define mysqldatadir    /var/lib/mysql
-
+#
+%{!?wsrep_version:%global wsrep_version @@WSREP_VERSION@@}
+#
 %if %{undefined revision}
 %define revision	1
 %endif