[fts-mysql] Production ready FTS MySQL plugin

MIchal Simon simonm at fedoraproject.org
Tue Oct 29 14:51:13 UTC 2013


commit b5ade1192b49e4dcfa679b340f90447ae0edaaa8
Author: simonm <michal.simon at cern.ch>
Date:   Tue Oct 29 15:50:56 2013 +0100

    Production ready FTS MySQL plugin

 .gitignore     |    1 +
 fts-mysql.spec |   14 ++++++++++++--
 sources        |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52404d0..c506a6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /fts-mysql-3.1.1.tar.gz
+/fts-mysql-3.1.33.tar.gz
diff --git a/fts-mysql.spec b/fts-mysql.spec
index 7e45d79..77851aa 100644
--- a/fts-mysql.spec
+++ b/fts-mysql.spec
@@ -1,5 +1,5 @@
 Name: fts-mysql
-Version: 3.1.1
+Version: 3.1.33
 Release: 1%{?dist}
 Summary: File Transfer Service V3 mysql plug-in
 Group: Applications/Internet
@@ -26,6 +26,16 @@ The File Transfer Service V3 mysql plug-in
 %setup -qc
 
 %build
+# Make sure the version in the spec file and the version used
+# for building matches
+fts_cmake_ver=`sed -n 's/^set(VERSION_\(MAJOR\|MINOR\|PATCH\) \([0-9]\+\).*/\2/p' CMakeLists.txt | paste -sd '.'`
+if [ "$fts_cmake_ver" != "%{version}" ]; then
+    echo "The version in the spec file does not match the CMakeLists.txt version!"
+    echo "$fts_cmake_ver != %{version}"
+    exit 1
+fi
+
+# Build
 mkdir build
 cd build
 %cmake -DMYSQLBUILD=ON -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_INSTALL_PREFIX='' ..
@@ -46,7 +56,7 @@ make install DESTDIR=%{buildroot}
 %doc LICENSE
 
 %changelog
-* Wed Aug 07 2013 Michal Simon <michal.simon at cern.ch> - 3.1.1-1
+* Wed Aug 07 2013 Michal Simon <michal.simon at cern.ch> - 3.1.1-2
   - no longer linking explicitly to boost libraries with '-mt' sufix 
   - sql scripts have been moved to datadir
 * Mon Jul 29 2013 Michal Simon <michal.simon at cern.ch> - 3.1.0-1
diff --git a/sources b/sources
index 2923705..0630bc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9f74126315e1033888e4a51a915e492  fts-mysql-3.1.1.tar.gz
+a5c8b62e3db04eea9477c1accc5a6d48  fts-mysql-3.1.33.tar.gz


More information about the scm-commits mailing list