[zorba] update to release 2.1.0

[Martin Gieseking]

commit e435410fe34e3c9cd968e2479b850472f55db194
Author: Martin Gieseking <martin.gieseking at uos.de>
Date:   Mon Dec 12 14:34:29 2011 +0100

    update to release 2.1.0

 .gitignore |    1 +
 sources    |    2 +-
 zorba.spec |   21 +++++++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a9fff8..de0e871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /zorba-2.0.2.tar.gz
 /zorba-2.0.3.tar.gz
+/zorba-2.1.0.tar.gz
diff --git a/sources b/sources
index 2d2b4a2..2b1cb5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44cce115c672d36ab22c2f3ca9ecc48c  zorba-2.0.3.tar.gz
+0affa4fcc6442c59b299b378cf87a40c  zorba-2.1.0.tar.gz
diff --git a/zorba.spec b/zorba.spec
index dca364b..d043ec0 100644
--- a/zorba.spec
+++ b/zorba.spec
@@ -12,7 +12,7 @@
 }
 
 Name:    zorba
-Version: 2.0.3
+Version: 2.1.0
 Release: 1%{?dist}
 Summary: General purpose XQuery processor implemented in C++
 Group:   System Environment/Libraries
@@ -25,9 +25,6 @@ License: ASL 2.0 and BSD and W3C and LGPLv2
 URL:     http://www.zorba-xquery.com
 Source0: http://launchpad.net/zorba/trunk/2.0/+download/%{name}-%{version}.tar.gz
 
-# move extension modules to %%{_libdir}/zorba-%{version}
-Patch0:  zorba-module-path.patch
-
 BuildRequires: bison
 BuildRequires: boost-devel
 BuildRequires: chrpath
@@ -68,6 +65,7 @@ disk-based large stores, S3 stores).
 Summary:  Development files for %{name}
 Group:    Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: cmake
 Requires: xqc
 
 %description devel
@@ -128,7 +126,6 @@ the programming APIs.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # xqc.h is provided by xqc package
 rm -f src/include/xqc.h
@@ -139,7 +136,7 @@ find \( -name "*.h" -o -name "*.cpp" \) -exec chmod 644 {} \;
 %build
 mkdir -p build
 cd build
-%cmake -DCMAKE_CXX_FLAGS_RELEASE:STRING='-DNDEBUG' -DCMAKE_C_FLAGS_RELEASE:STRING='-DNDEBUG' ..
+%cmake -DZORBA_LIB_DIRNAME:STRING='%{_lib}' ..
 
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -155,6 +152,10 @@ make doc
 %install
 make install DESTDIR=%{buildroot} INSTALL="install -p" -C build
 
+# move cmake files to cmake module directory
+mkdir -p %{buildroot}%{_datadir}/cmake/Modules/
+mv %{buildroot}%{_datadir}/cmake/zorba-%{version}/* %{buildroot}%{_datadir}/cmake/Modules/
+
 # move Java extension module to proper directory
 mkdir -p %{buildroot}%{_libdir}/zorba-java/
 cp -p build/swig/java/zorba.jar %{buildroot}%{_libdir}/zorba-java/
@@ -197,14 +198,15 @@ rm -f doc.tmp/*.txt
 %{_bindir}/zorba
 %{_bindir}/testdriver
 %{_libdir}/libzorba_simplestore.so.*
-%{_libdir}/zorba-%{version}/
+%{_libdir}/zorba/
+%{_datadir}/zorba/
 %dir %{_datadir}/zorba-%{version}/
 %{_datadir}/zorba-%{version}/xqdoc/
 
 %files devel
 %{_libdir}/libzorba_simplestore.so
 %{_includedir}/zorba/
-%{_datadir}/zorba-%{version}/cmake/
+%{_datadir}/cmake/Modules/*
 
 %files python
 %{python_sitearch}/_zorba_api.so
@@ -227,6 +229,9 @@ rm -f doc.tmp/*.txt
 
 
 %changelog
+* Sat Dec 10 2011 Martin Gieseking <martin.gieseking at uos.de> 2.1.0-1
+- updated to new upstream release
+
 * Sun Nov 13 2011 Martin Gieseking <martin.gieseking at uos.de> 2.0.3-1
 - updated to new upstream release
 - updated Source0 as the upstream repository moved to launchpad