- up to 2.4.12

diff --git a/jsmn.patch b/jsmn.patch
index bc9c4cb1a8105364390f71ba08ad0b08888deabc..b32989b8c33ba9b023e72fba10621ef00e833041 100644 (file)
--- a/jsmn.patch
+++ b/jsmn.patch
@@ -1,18 +1,18 @@
---- percona-xtrabackup-2.3.3/./storage/innobase/xtrabackup/src/CMakeLists.txt~ 2015-12-14 21:49:07.000000000 +0200
-+++ percona-xtrabackup-2.3.3/./storage/innobase/xtrabackup/src/CMakeLists.txt  2016-01-02 01:20:57.242088388 +0200
-@@ -18,7 +18,6 @@
- INCLUDE(libev)
+--- percona-xtrabackup-2.4.12/storage/innobase/xtrabackup/src/CMakeLists.txt~  2018-06-14 10:53:16.000000000 +0200
++++ percona-xtrabackup-2.4.12/storage/innobase/xtrabackup/src/CMakeLists.txt   2018-09-22 18:40:38.135505740 +0200
+@@ -21,7 +21,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
  
  ADD_SUBDIRECTORY(libarchive)
+ ADD_SUBDIRECTORY(crc)
 -ADD_SUBDIRECTORY(jsmn)
  
+ SET(WITH_CURL "system" CACHE STRING "Using system curl by default")
  FIND_GCRYPT()
- FIND_CURL()
-@@ -37,7 +36,6 @@
+@@ -41,7 +40,6 @@ INCLUDE_DIRECTORIES(
    ${CMAKE_SOURCE_DIR}/sql
    ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/libarchive/libarchive
    ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/quicklz
 -  ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/jsmn
+   ${CMAKE_SOURCE_DIR}/storage/innobase/xtrabackup/src/crc
    ${GCRYPT_INCLUDE_DIR}
    ${CURL_INCLUDE_DIRS}
-   ${LIBEV_INCLUDE_DIRS}

diff --git a/xtrabackup.spec b/xtrabackup.spec
index b765b67f1c58ece41558173f3df8d5b5915d089d..0a1c962762893303574fbcd84ee871b09fa9f15a 100644 (file)
--- a/xtrabackup.spec
+++ b/xtrabackup.spec
@@ -2,12 +2,14 @@
 # - build instructions: http://www.percona.com/doc/percona-xtrabackup/2.2/installation/compiling_xtrabackup.html
 Summary:       XtraBackup online backup for MySQL / InnoDB
 Name:          xtrabackup
-Version:       2.3.3
-Release:       3
+Version:       2.4.12
+Release:       1
 License:       GPL v2
 Group:         Applications/Databases
 Source0:       https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-%{version}/source/tarball/percona-%{name}-%{version}.tar.gz
-# Source0-md5: eb2c006a75b5099665f04a54211fe8d5
+# Source0-md5: c086206421a77f7c1ad28771a75cf396
+Source1:       http://downloads.sourceforge.net/boost/boost_1_59_0.tar.bz2
+# Source1-md5: 6aa9a5c6a4ca1016edd0ed1178e3cb87
 Patch0:        jsmn.patch
 URL:           http://www.percona.com/doc/percona-xtrabackup/
 BuildRequires: bash
@@ -46,7 +48,7 @@ enhanced functionality, such as interacting with a running MySQL
 server and backing up MyISAM tables.
 
 %prep
-%setup -q -n percona-%{name}-%{version}
+%setup -q -n percona-%{name}-%{version} -a1
 %patch0 -p1
 
 # use system package
@@ -67,6 +69,7 @@ cd build
        -DWITH_READLINE=system \
        -DWITH_ZLIB=system \
        -DWITH_SSL=system \
+       -DWITH_BOOST="$(pwd)/$(ls -1d ../boost_*)" \
        ..
 
 %{__make}