Merge lp:~abychko/percona-server/5.6-new-packaging-Stewart into lp:percona-server/5.6

[Alexey Bychko]

fixed packaging from Stewart

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'README'
--- README	2013-11-15 03:29:06 +0000
+++ README	2014-01-28 10:44:01 +0000
@@ -1,11 +1,11 @@
-Percona Server 5.5
+Percona Server 5.6
 ------------------
 
-Percona Server is a branch of MySQL 5.5 bringing higher performance,
+Percona Server is a branch of MySQL 5.6 bringing higher performance,
 reliability and more features.
 
 http://www.percona.com/software/percona-server/
 
-Documentation: http://www.percona.com/doc/percona-server/5.5
+Documentation: http://www.percona.com/doc/percona-server/5.6
 
 Launchpad (bugs, milestones, branches): http://launchpad.net/percona-server

=== modified file 'build-ps/debian/control'
--- build-ps/debian/control	2013-12-22 23:31:06 +0000
+++ build-ps/debian/control	2014-01-28 10:44:01 +0000
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Percona Server Development Team <[e-mail]>
 Uploaders: Stewart Smith <[e-mail]>, Alexey Bychko <[e-mail]>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 8.1.3~), file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, doxygen-latex, ghostscript,  gawk, bison, lsb-release, hardening-wrapper, cmake, dh-apparmor, gcc-4.4 [any-i386], g++-4.4 [any-i386], libaio-dev[linux-any], libpam-dev, libssl-dev
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper, file (>= 3.28), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline-dev, psmisc, po-debconf, chrpath, ghostscript,  gawk, bison, lsb-release, cmake, gcc, g++, libaio-dev[linux-any], libpam-dev, libssl-dev
 Standards-Version: 3.9.4
 Homepage: http://www.percona.com/software/percona-server/
 Vcs-Bzr: lp:percona-server/5.6

=== modified file 'build-ps/debian/rules'
--- build-ps/debian/rules	2014-01-15 08:49:17 +0000
+++ build-ps/debian/rules	2014-01-28 10:44:01 +0000
@@ -14,9 +14,9 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
-ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
-    USE_THIS_GCC_VERSION:=-4.4
-endif
+#ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
+#    USE_THIS_GCC_VERSION:=-4.4
+#endif
 
 export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc$(USE_THIS_GCC_VERSION)
 export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++$(USE_THIS_GCC_VERSION)
@@ -35,7 +35,7 @@
 
 MYSQL_SRC = $(shell pwd)
 
-MAKE_TEST_TARGET=test-mtr
+#MAKE_TEST_TARGET=test-mtr
 ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
 # make test-bt is the testsuite run by the MySQL build team 
 # before a release, but it is long
@@ -92,7 +92,7 @@
 		$(USE_STATIC_MYSQLD) \
 		$(USE_LINUX_NATIVE_AIO) \
 		-DWITH_ZLIB=system \
-		-DWITH_SSL=bundled \
+		-DWITH_SSL=system \
 	    -DCOMPILATION_COMMENT="($(DISTRIBUTION))" \
 	    -DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
 	    -DSYSTEM_TYPE="debian-linux-gnu" \
@@ -268,9 +268,7 @@
 	dh_installexamples -a
 	dh_installmenu -a
 	dh_installlogrotate -a --name mysql-server
-	if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then \
-	  dh_apparmor -pmysql-server-5.6 --profile-name=usr.sbin.mysqld; \
-	fi
+	if [ "$(DISTRIBUTION)" = "Ubuntu" ]; then if [ "$(DISTRELEASE)"  != "lucid"]; then dh_apparmor -pmysql-server-5.5 --profile-name=usr.sbin.mysqld; fi; fi
 	# Start mysql in runlevel 19 before 20 where apache, proftpd etc gets
 	# started which might depend on a running database server.
 	dh_installinit -a --name=mysql -- defaults 19 21

=== modified file 'build-ps/percona-server.spec'
--- build-ps/percona-server.spec	2014-01-16 05:48:56 +0000
+++ build-ps/percona-server.spec	2014-01-28 10:44:01 +0000
@@ -25,17 +25,15 @@
 %define mysql_vendor            Oracle and/or its affiliates
 %define percona_server_vendor	Percona, Inc
 
-%define mysql_version   5.6.15
+%define mysql_version @@MYSQL_VERSION@@
 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
-%define majorversion 62
-%define minorversion 0
-%define percona_server_version	%{majorversion}.%{minorversion}
+%define percona_server_version @@PERCONA_VERSION@@
 
 %define mysqld_user     mysql
 %define mysqld_group    mysql
 %define mysqldatadir    /var/lib/mysql
 
-%define release         rel%{majorversion}.%{minorversion}.1%{?dist}
+%define release         rel%{percona_server_version}.1%{?dist}
 
 #
 # Macros we use which are not available in all supported versions of RPM
@@ -227,7 +225,7 @@
 Release:        %{release}
 Distribution:   %{distro_description}
 License:        Copyright (c) 2000, 2010, %{mysql_vendor}.  All rights reserved.  Use is subject to license terms.  Under %{license_type} license as shown in the Description field.
-Source:         http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{majorversion}.%{minorversion}/source/%{src_dir}.tar.gz
+Source:         http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-%{mysql_version}-%{percona_server_version}/source/%{src_dir}.tar.gz
 URL:            http://www.percona.com/
 Packager:       Percona MySQL Development Team <[e-mail]>
 Vendor:         %{percona_server_vendor}
@@ -364,10 +362,12 @@
 %if "%{_arch}" == "ia64"
 RPM_OPT_FLAGS=
 %endif
-
+#
+RPM_OPT_FLAGS=$(echo ${RPM_OPT_FLAGS} | sed -e 's|-march=i386|-march=i686|g')
+#
 export PATH=${MYSQL_BUILD_PATH:-$PATH}
 export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}
+export CXX=${MYSQL_BUILD_CXX:-${CXX:-g++}}
 export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
 export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-rtti}}
 export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
@@ -463,33 +463,11 @@
 # Clean up the BuildRoot first
 [ "$RBR" != "/" ] && [ -d "$RBR" ] && rm -rf "$RBR";
 
-# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  This
-# needs to be during build phase as $CC is not set during install.
-if "$CC" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1
-then
-  libgcc=`$CC $CFLAGS --print-libgcc-file`
-  if [ -f $libgcc ]
-  then
-    mkdir -p $RBR%{_libdir}/mysql
-    install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
-    echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
-  fi
-fi
-
-# Move temporarily the saved files to the BUILD directory since the BUILDROOT
-# dir will be cleaned at the start of the install phase
-mkdir -p "$RPM_BUILD_DIR/%{_libdir}"
-mv $RBR%{_libdir} $RPM_BUILD_DIR/%{_libdir}
-
 ##############################################################################
 %install
 
 RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}%{server_suffix}
-
-# Move back the libdir from BUILD dir to BUILDROOT
-mkdir -p "$RBR%{_libdir}"
-mv $RPM_BUILD_DIR/%{_libdir} $RBR%{_libdir}
+MBD=$RPM_BUILD_DIR/percona-server-%{mysql_version}-%{percona_server_version}
 
 # Ensure that needed directories exists
 install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
@@ -517,6 +495,19 @@
   make DESTDIR=$RBR install
 )
 
+# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  This
+# needs to be during build phase as $CC is not set during install.
+if "$CC" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1
+then
+  libgcc=`$CC $CFLAGS --print-libgcc-file`
+  if [ -f $libgcc ]
+  then
+    mkdir -p $RBR%{_libdir}/mysql
+    install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
+    echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
+  fi
+fi
+
 # FIXME: at some point we should stop doing this and just install everything
 # FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming
 # FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax

=== modified file 'cmake/ssl.cmake'
--- cmake/ssl.cmake	2013-06-01 05:18:49 +0000
+++ cmake/ssl.cmake	2014-01-28 10:44:01 +0000
@@ -232,8 +232,7 @@
       MYSQL_USE_BUNDLED_SSL()
     ENDIF()
   ELSE()
-    MESSAGE(SEND_ERROR
-      "Wrong option for WITH_SSL. Valid values are : "${WITH_SSL_DOC})
+    MESSAGE(SEND_ERROR "Wrong option for WITH_SSL. Valid values are: " ${WITH_SSL_DOC})
   ENDIF()
 ENDMACRO()