[zorba] update to release 2.5.0

[Martin Gieseking]

commit 30598cf35ceb048fcbf5a319c23a2f1833b0f511
Author: Martin Gieseking <martin.gieseking at uos.de>
Date:   Fri Jun 15 18:25:17 2012 +0200

    update to release 2.5.0

 .gitignore               |    1 +
 sources                  |    2 +-
 zorba-2.2.0-unistd.patch |   26 --------------------------
 zorba.spec               |   22 ++++++++++++----------
 4 files changed, 14 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 951e4da..3df52f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /zorba-2.0.3.tar.gz
 /zorba-2.1.0.tar.gz
 /zorba-2.2.0.tar.gz
+/zorba-2.5.0.zip
diff --git a/sources b/sources
index 4fda5c8..a2c67c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83cf9edc4a2068f198ff227d942f6ed5  zorba-2.2.0.tar.gz
+2212349299d48bc774f76c8e72e35f85  zorba-2.5.0.zip
diff --git a/zorba.spec b/zorba.spec
index 06face7..416dce4 100644
--- a/zorba.spec
+++ b/zorba.spec
@@ -11,8 +11,8 @@
 }
 
 Name:    zorba
-Version: 2.2.0
-Release: 3%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
 Summary: General purpose XQuery processor implemented in C++
 Group:   System Environment/Libraries
 
@@ -22,15 +22,11 @@ Group:   System Environment/Libraries
 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
+Source0: http://launchpad.net/zorba/trunk/2.0/+download/%{name}-%{version}.zip
 
 # adapt path to php API wrapper 
 Patch0:  zorba-php-wrapper.patch
 
-# add missing includes
-# https://bugs.launchpad.net/zorba/+bug/963091
-Patch1:  zorba-%{version}-unistd.patch
-
 BuildRequires: bison
 BuildRequires: boost-devel
 BuildRequires: chrpath
@@ -133,18 +129,19 @@ the programming APIs.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 # xqc.h is provided by xqc package
 rm -f src/include/xqc.h
 
 find \( -name "*.h" -o -name "*.cpp" \) -exec chmod 644 {} \;
 
+# avoid doxygen issue (can't run 'dot' when absolute path is given)
+find doc -name 'doxy.config.in' -exec sed -i 's/@DOXYGEN_DOT_EXECUTABLE_PATH@/dot/' {} \;
 
 %build
 mkdir -p build
 cd build
-%cmake -DZORBA_LIB_DIRNAME:STRING='%{_lib}' ..
+%cmake -DZORBA_LIB_DIRNAME:STRING='%{_lib}' -DCMAKE_CXX_FLAGS_RELEASE:STRING='-DNDEBUG' -DCMAKE_C_FLAGS_RELEASE='-DNDEBUG' ..
 
 make VERBOSE=1 %{?_smp_mflags}
 
@@ -168,7 +165,8 @@ mv %{buildroot}%{_datadir}/cmake/zorba-%{version}/* %{buildroot}%{_datadir}/cmak
 mkdir -p %{buildroot}%{_libdir}/zorba-java/
 cp -p build/swig/java/zorba.jar %{buildroot}%{_libdir}/zorba-java/
 mv %{buildroot}%{_datadir}/java/*.so %{buildroot}%{_libdir}/zorba-java/
-rm -f %{buildroot}%{_datadir}/java/*.java
+mv %{buildroot}%{_datadir}/java/zorba_xqj.jar %{buildroot}%{_libdir}/zorba-java/
+rm -f %{buildroot}%{_datadir}/java/*
 
 # move PHP extension module to proper directories
 mkdir -p %{buildroot}%{php_extdir}
@@ -240,6 +238,10 @@ rm -f doc.tmp/*.txt
 
 
 %changelog
+* Fri Jun 15 2012 Martin Gieseking <martin.gieseking at uos.de> 2.5.0-1
+- Updated to new upstream release.
+- Removed patch that fixed missing includes (has been applied upstream).
+
 * Mon Apr 23 2012 Martin Gieseking <martin.gieseking at uos.de>  2.2.0-3
 - Rebuilt due to soname bump of libicu