[fts] Production ready FTS3 (3.1.33)

[MIchal Simon]

commit bac729d3720c98d4ce17f2ce0445f36b9022ca23
Author: simonm <michal.simon at cern.ch>
Date:   Tue Oct 29 11:00:03 2013 +0100

    Production ready FTS3 (3.1.33)

 .gitignore |    1 +
 fts.spec   |   33 ++++++++++++++++++++-------------
 sources    |    2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 373a622..5df711a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /fts-3.0.3.tar.gz
 /fts-3.1.0.tar.gz
 /fts-3.1.1.tar.gz
+/fts-3.1.33.tar.gz
diff --git a/fts.spec b/fts.spec
index 389a165..c02be59 100644
--- a/fts.spec
+++ b/fts.spec
@@ -3,8 +3,8 @@
 %global __provides_exclude_from ^%{python_sitearch}/fts/.*\\.so$
 
 Name: fts
-Version: 3.1.1
-Release: 3%{?dist}
+Version: 3.1.33
+Release: 1%{?dist}
 Summary: File Transfer Service V3
 Group: System Environment/Daemons
 License: ASL 2.0
@@ -124,6 +124,16 @@ administering purposes.
 
 
 %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 -DMAINBUILD=ON -D CMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_INSTALL_PREFIX='' ..
@@ -138,6 +148,7 @@ mkdir -p %{buildroot}%{_var}/lib/fts3/status
 mkdir -p %{buildroot}%{_var}/lib/fts3/stalled
 mkdir -p %{buildroot}%{_var}/lib/fts3/logs
 mkdir -p %{buildroot}%{_var}/log/fts3
+mkdir -p %{buildroot}%{_sysconfdir}/fts3
 make install DESTDIR=%{buildroot}
 mkdir -p %{buildroot}%{python_sitearch}/fts
 
@@ -208,8 +219,9 @@ exit 0
 %dir %attr(0755,fts3,root) %{_var}/lib/fts3/stalled
 %dir %attr(0755,fts3,root) %{_var}/lib/fts3/logs
 %dir %attr(0755,fts3,root) %{_var}/log/fts3
-%attr(0644,fts3,root) %{_var}/lib/fts3/bdii_cache.xml
-%attr(0644,fts3,root) %{_var}/lib/fts3/myosg.xml
+%dir %attr(0755,fts3,root) %{_sysconfdir}/fts3
+%config(noreplace) %attr(0644,fts3,root) %{_var}/lib/fts3/bdii_cache.xml
+%config(noreplace) %attr(0644,fts3,root) %{_var}/lib/fts3/myosg.xml
 %{_sbindir}/fts*
 %attr(0755,root,root) %{_initddir}/fts-msg-bulk
 %attr(0755,root,root) %{_initddir}/fts-server
@@ -247,6 +259,7 @@ exit 0
 %{_libdir}/libfts_config.so.*
 %{_libdir}/libfts_infosys.so.*
 %{_libdir}/libfts_db_generic.so.*
+%{_libdir}/libfts_db_profiled.so
 %{_libdir}/libfts_msg_ifce.so.*
 %{_libdir}/libfts_proxy.so.*
 %{_libdir}/libfts_server_gsoap_transfer.so.*
@@ -256,6 +269,7 @@ exit 0
 %{_libdir}/libfts_ws_ifce_server.so.*
 %{_libdir}/libfts_delegation_api_simple.so.*
 %{_libdir}/libfts_delegation_api_cpp.so.*
+%{_libdir}/libfts_profiler.so
 %doc README
 %doc LICENSE
 
@@ -283,14 +297,7 @@ exit 0
 
 
 %changelog
-* Wed Oct 23 2013 Alejandro Alvarez <aalvarez at cern.ch> - 3.1.1-3
-  - Rebuild for new gsoap version
-
-* Fri Sep 13 2013 Alejandro Alvarez <aalvaez at cern.ch> - 3.1.1-2
-  - Rebuild new libactivemq-cpp version
-  - Fixed bogus date
-
-* 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
   - GenericDbIfce.h includes new blacklisting API
   - no longer linking explicitly to boost libraries with '-mt' sufix 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-3
@@ -301,7 +308,7 @@ exit 0
     suffix from several boost libraries (fts-3.1.0-boost_mt.patch)
 * Wed Jul 24 2013 Michal Simon <michal.simon at cern.ch> - 3.0.3-15
   - compatible with rawhide (f20)
-* Fri Jul 05 2013 Michail Salichos <michail.salichos at cern.ch> - 3.0.3-14
+* Fri Jul 02 2013 Michail Salichos <michail.salichos at cern.ch> - 3.0.3-14
   - mysql queries optimization
 * Fri Jun 14 2013 Michal Simon <michal.simon at cern.ch> - 3.0.3-1
   - dependency on 'gfal2-plugin-http' has been removed
diff --git a/sources b/sources
index 1c2614f..cbd5e1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cfe839d185463bfdf77421052d693517  fts-3.1.1.tar.gz
+29818fc7ac9b5acd2de6b9ad6518081a  fts-3.1.33.tar.gz