Use idzorba package instead of bundled spec MPX-7

diff --git a/mp-xquery.spec b/mp-xquery.spec
index 092d1d9..50b91c1 100644 (file)
--- a/mp-xquery.spec
+++ b/mp-xquery.spec
@@ -6,7 +6,7 @@ Release: 1.indexdata
 BuildRequires: gcc gcc-c++ pkgconfig
 BuildRequires: libmetaproxy6-devel >= 1.4.0
 BuildRequires: wget
-BuildRequires: zorba
+BuildRequires: idzorba
 License: proprietary
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
@@ -20,7 +20,7 @@ Record conversion module using the Zorba XQuery library
 
 Requires: metaproxy6
 Requires: libmetaproxy6
-Requires: zorba
+Requires: idzorba
 
 %post
 if [ -d /usr/lib64/metaproxy6/modules ]; then

diff --git a/zorba.spec b/zorba.spec
deleted file mode 100644 (file)
index 9d567e2..0000000
--- a/zorba.spec
+++ /dev/null
@@ -1,50 +0,0 @@
-Summary: XQuery Processor
-Name: zorba
-Version: 3.0
-Release: 1.indexdata
-BuildRequires: gcc gcc-c++ pkgconfig
-BuildRequires: wget
-BuildRequires: xerces-c-devel
-BuildRequires: libcurl-devel
-BuildRequires: libedit-devel
-BuildRequires: libxslt-devel
-BuildRequires: bison
-License: Apache
-Group: Applications/Internet
-Vendor: Index Data ApS <info@indexdata.dk>
-Source: zorba-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Packager: Adam Dickmeiss <adam@indexdata.dk>
-URL: http://www.indexdata.com/mp-xquery
-
-%description
-Zorba - The XQuery Processor developed by the FLWOR Foundation
-
-Requires: libcurl
-Requires: xerces-c
-
-%prep
-%setup
-
-%build
-mkdir build
-cd build
-/opt/cmake/bin/cmake \
-       -Wno-dev \
-       -D CMAKE_INSTALL_PREFIX=/opt/zorba \
-       -D ZORBA_SUPPRESS_SWIG:BOOL=ON \
-       ..
-cd ..
-
-%install
-cd build
-rm -fr ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install
-cd ..
-
-%clean
-rm -fr ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-,root,root)
-/opt/zorba