[zorba] update to release 2.2.0
Martin Gieseking
mgieseki at fedoraproject.org
Fri Mar 23 13:49:29 UTC 2012
commit a786bd2a0e224f399644d064805d8815149d700d
Author: Martin Gieseking <martin.gieseking at uos.de>
Date: Fri Mar 23 14:48:56 2012 +0100
update to release 2.2.0
.gitignore | 1 +
sources | 2 +-
zorba-2.1.0-unistd.patch | 12 ------------
zorba-2.2.0-unistd.patch | 26 ++++++++++++++++++++++++++
zorba-php-wrapper.patch | 11 +++++++++++
zorba.spec | 33 ++++++++++++++++++++++-----------
6 files changed, 61 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de0e871..951e4da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/zorba-2.0.2.tar.gz
/zorba-2.0.3.tar.gz
/zorba-2.1.0.tar.gz
+/zorba-2.2.0.tar.gz
diff --git a/sources b/sources
index 2b1cb5a..4fda5c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0affa4fcc6442c59b299b378cf87a40c zorba-2.1.0.tar.gz
+83cf9edc4a2068f198ff227d942f6ed5 zorba-2.2.0.tar.gz
diff --git a/zorba-2.2.0-unistd.patch b/zorba-2.2.0-unistd.patch
new file mode 100644
index 0000000..252dccf
--- /dev/null
+++ b/zorba-2.2.0-unistd.patch
@@ -0,0 +1,26 @@
+diff --git a/bin/debugger/main.cpp b/bin/debugger/main.cpp
+--- a/bin/debugger/main.cpp
++++ b/bin/debugger/main.cpp
+@@ -18,6 +18,8 @@
+ # include <windows.h>
+ # include <string.h>
+ # include <strsafe.h>
++#else
++#include <unistd.h>
+ #endif
+
+ #include <vector>
+diff --git a/bin/debugger/process_listener.cpp b/bin/debugger/process_listener.cpp
+--- a/bin/debugger/process_listener.cpp
++++ b/bin/debugger/process_listener.cpp
+@@ -18,6 +18,10 @@
+
+ #include <iostream>
+
++#ifndef WIN32
++#include <unistd.h>
++#endif
++
+ #ifdef ZORBA_HAVE_PTHREAD_H
+ # include <cassert>
+ #endif
diff --git a/zorba-php-wrapper.patch b/zorba-php-wrapper.patch
new file mode 100644
index 0000000..23bdbf6
--- /dev/null
+++ b/zorba-php-wrapper.patch
@@ -0,0 +1,11 @@
+diff --git a/swig/php/XQueryProcessor.php b/swig/php/XQueryProcessor.php
+index 2b0e987..31e60e8 100644
+--- a/swig/php/XQueryProcessor.php
++++ b/swig/php/XQueryProcessor.php
+@@ -1,5 +1,5 @@
+ <?php
+-require_once 'Zorba/zorba_api_wrapper.php';
++require_once 'zorba/zorba_api_wrapper.php';
+
+ class XQueryCompilerException extends Exception{}
+ class XQueryProcessorException extends Exception{}
diff --git a/zorba.spec b/zorba.spec
index 7878eae..5599e0d 100644
--- a/zorba.spec
+++ b/zorba.spec
@@ -1,17 +1,18 @@
%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
%{?filter_setup:
%filter_provides_in %{python_sitearch}.*\.so$
%filter_provides_in %{php_extdir}.*\.so$
-%filter_provides_in %{ruby_vendorarchdir}.*\.so$
+%filter_provides_in %{ruby_sitearch}.*\.so$
%filter_provides_in %{_docdir}
%filter_requires_in %{_docdir}
%filter_setup
}
Name: zorba
-Version: 2.1.0
-Release: 5%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
Summary: General purpose XQuery processor implemented in C++
Group: System Environment/Libraries
@@ -23,9 +24,12 @@ 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
-# add missing includes of unistd.h required for gcc 4.7
-# https://bugs.launchpad.net/zorba/+bug/911956
-Patch0: %{name}-%{version}-unistd.patch
+# 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
@@ -100,7 +104,7 @@ This package provides the PHP module to use the %{name} API.
Summary: Ruby language binding for %{name}
Group: Development/Languages
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: ruby
+Requires: ruby(abi) = 1.8
%description ruby
This package provides the Ruby module to use the %{name} API.
@@ -129,6 +133,7 @@ the programming APIs.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# xqc.h is provided by xqc package
rm -f src/include/xqc.h
@@ -168,7 +173,7 @@ rm -f %{buildroot}%{_datadir}/java/*.java
# move PHP extension module to proper directories
mkdir -p %{buildroot}%{php_extdir}
mkdir -p %{buildroot}%{_datadir}/php/zorba
-mv %{buildroot}%{_datadir}/php5/zorba_api_wrapper.php %{buildroot}%{_datadir}/php/zorba
+mv %{buildroot}%{_datadir}/php5/*.php %{buildroot}%{_datadir}/php/zorba
mv %{buildroot}%{_datadir}/php5/zorba_api.so %{buildroot}%{php_extdir}
# move Python extension module to proper directory
@@ -176,11 +181,12 @@ mkdir -p %{buildroot}%{python_sitearch}
mv %{buildroot}%{_datadir}/python/* %{buildroot}%{python_sitearch}
# move Ruby extension module to proper directory
-mkdir -p %{buildroot}%{ruby_vendorarchdir}
-mv %{buildroot}%{_datadir}/ruby/zorba_api.so %{buildroot}%{ruby_vendorarchdir}
+mkdir -p %{buildroot}%{ruby_sitearch}
+mv %{buildroot}%{_datadir}/ruby/zorba_api.so %{buildroot}%{ruby_sitearch}
chrpath --delete %{buildroot}%{_bindir}/zorba
chrpath --delete %{buildroot}%{_bindir}/testdriver
+chrpath --delete %{buildroot}%{_bindir}/xqdb
find %{buildroot} -name "*.so" -exec chrpath --delete {} \;
find %{buildroot} -name "*.so" -exec chmod 755 {} \;
@@ -200,6 +206,7 @@ rm -f doc.tmp/*.txt
%doc ChangeLog AUTHORS.txt LICENSE.txt NOTICE.txt README.txt
%{_bindir}/zorba
%{_bindir}/testdriver
+%{_bindir}/xqdb
%{_libdir}/libzorba_simplestore.so.*
%{_libdir}/zorba/
%{_datadir}/zorba/
@@ -218,10 +225,11 @@ rm -f doc.tmp/*.txt
%files php
%dir %{_datadir}/php/zorba/
%{_datadir}/php/zorba/zorba_api_wrapper.php
+%{_datadir}/php/zorba/XQueryProcessor.php
%{php_extdir}/zorba_api.so
%files ruby
-%{ruby_vendorarchdir}/zorba_api.so
+%{ruby_sitearch}/zorba_api.so
%files java
%{_libdir}/zorba-java/
@@ -232,6 +240,9 @@ rm -f doc.tmp/*.txt
%changelog
+* Fri Mar 23 2012 Martin Gieseking <martin.gieseking at uos.de> 2.2.0-1
+- Updated to new upstream release
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-5
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list