[xqilla/f15] take ownership of xqilla use system xqc instead of embedded header add man page (courtesy of debian)

Wed Nov 9 08:32:01 UTC 2011

commit ef8a8ae01cba854580b1bd6f196c16ba0aff8477
Author: Haikel Guemar <hguemar at fedoraproject.org>
Date:   Tue Aug 9 08:37:03 2011 +0200

    take ownership of xqilla
    use system xqc instead of embedded header
    add man page (courtesy of debian)
    spec cleanup

 sources                             |    2 +-
 xqilla-2.2.4-gcc46.patch            |   11 ++++
 xqilla-2.2.4-use-system-xqc.h.patch |   22 +++++++
 xqilla.1                            |  113 +++++++++++++++++++++++++++++++++++
 xqilla.spec                         |   46 +++++++++++---
 5 files changed, 183 insertions(+), 11 deletions(-)
---

diff --git a/sources b/sources
index f5874c5..e79b137 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be8cb54b1a30cf85e2854ce3d0411acb  XQilla-2.2.3.tar.gz
+a00672133d06772f54f18d0fda304c02  XQilla-2.2.4.tar.gz
diff --git a/xqilla-2.2.4-gcc46.patch b/xqilla-2.2.4-gcc46.patch
new file mode 100644
index 0000000..83c450a
--- /dev/null
+++ b/xqilla-2.2.4-gcc46.patch
@@ -0,0 +1,11 @@
+diff -up XQilla-2.2.4/include/xqilla/framework/XPath2MemoryManager.hpp.gcc46 XQilla-2.2.4/include/xqilla/framework/XPath2MemoryManager.hpp
+--- XQilla-2.2.4/include/xqilla/framework/XPath2MemoryManager.hpp.gcc46	2010-01-13 17:40:36.000000000 +0200
++++ XQilla-2.2.4/include/xqilla/framework/XPath2MemoryManager.hpp	2011-03-10 13:48:18.679481503 +0200
+@@ -24,6 +24,7 @@
+ 
+ #include <algorithm>
+ #include <assert.h>
++#include <cstddef>
+ 
+ #include <xqilla/framework/XQillaExport.hpp>
+ 
diff --git a/xqilla-2.2.4-use-system-xqc.h.patch b/xqilla-2.2.4-use-system-xqc.h.patch
new file mode 100644
index 0000000..a41c67a
--- /dev/null
+++ b/xqilla-2.2.4-use-system-xqc.h.patch
@@ -0,0 +1,22 @@
+diff --git a/include/Makefile.am b/include/Makefile.am
+index 6461800..19c1cc2 100644
+--- a/include/Makefile.am
++++ b/include/Makefile.am
+@@ -1,5 +1,4 @@
+ nobase_include_HEADERS = \
+-xqc.h \
+ xqilla/xqilla-dom3.hpp \
+ xqilla/xqilla-simple.hpp \
+ xqilla/xqilla-xqc.h \
+diff --git a/include/Makefile.in b/include/Makefile.in
+index ccf0fb8..800fa16 100644
+--- a/include/Makefile.in
++++ b/include/Makefile.in
+@@ -216,7 +216,6 @@ xerces_include = @xerces_include@
+ xerces_include_dir = @xerces_include_dir@
+ xerces_lib = @xerces_lib@
+ nobase_include_HEADERS = \
+-xqc.h \
+ xqilla/xqilla-dom3.hpp \
+ xqilla/xqilla-simple.hpp \
+ xqilla/xqilla-xqc.h \
diff --git a/xqilla.1 b/xqilla.1
new file mode 100644
index 0000000..c262335
--- /dev/null
+++ b/xqilla.1
@@ -0,0 +1,113 @@
+.\"  -*- nroff -*-
+.\"
+.\" This manual page xqilla.1 is based on xqilla help output.
+.\"
+.\" Author: Tommi Vainikainen <thv at iki.fi>
+.\"
+.\" Copyright (c) 2001-2008
+.\"     DecisionSoft Limited. All rights reserved.
+.\" Copyright (c) 2004-2008
+.\"     Oracle. All rights reserved.
+.\" Copyright (C) 2010
+.\"     Tommi Vainikainen. No rights reserved.
+.\"
+.\" Licensed under the Apache License, Version 2.0 (the "License");
+.\" you may not use this file except in compliance with the License.
+.\" You may obtain a copy of the License at
+.\"
+.\"     http://www.apache.org/licenses/LICENSE-2.0
+.\"
+.\" Unless required by applicable law or agreed to in writing, software
+.\" distributed under the License is distributed on an "AS IS" BASIS,
+.\" WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.\" See the License for the specific language governing permissions and
+.\" limitations under the License.
+.\"
+.\" Created: 2010-01-21
+.\"
+.TH XQILLA "1" "January 2010" "xqilla" "User Commands"
+.SH NAME
+xqilla \- run XQuery and XPath 2 expressions
+.SH SYNOPSIS
+.B xqilla
+[\fIOPTION\fR]... \fXQUERY-FILE\fR...
+.SH DESCRIPTION
+Run XQuery and XPath 2 expressions from QUERY-FILE.
+.TP
+\fB\-h\fR
+Show help and exit
+.TP
+\fB\-p\fR
+Parse in XPath 2 mode (default is XQuery mode)
+.TP
+\fB\-P\fR
+Parse in XPath 1.0 compatibility mode (default is XQuery mode)
+.TP
+\fB\-s\fR
+Parse XSLT 2.0
+.TP
+\fB\-f\fR
+Parse using W3C Full-Text extensions
+.TP
+\fB\-u\fR
+Parse using W3C Update extensions
+.TP
+\fB\-e\fR
+Parse using XQilla specific extensions
+.TP
+\fB\-d\fR
+Run the query in interactive debugging mode
+.TP
+\fB\-x\fR
+Use the Xerces-C data model (default is the FastXDM)
+.TP
+\fB\-i\fR \fIfile\fR
+Load XML document and bind it as the context item
+.TP
+\fB\-b\fR \fIbaseURI\fR
+Set the base URI for the context
+.TP
+\fB\-v\fR \fIname\fR \fIvalue\fR
+Bind the name value pair as an external variable
+.TP
+\fB\-o\fR \fIfile\fR
+Write the result to the specified file
+.TP
+\fB\-n\fR \fInumber\fR
+Run the queries a number of times
+.TP
+\fB\-q\fR
+Quiet mode - no output
+.TP
+\fB\-t\fR
+Output an XML representation of the AST
+.PP
+The
+.B xqilla
+command line tool can be used to run XQuery and XPath 2
+expressions. It is also a good example of how to use the
+.B Simple API
+of the
+.B XQilla
+library.
+.SH "REPORTING BUGS"
+Report bugs to <https://sourceforge.net/projects/xqilla/support>.
+.SH COPYRIGHT
+Copyright \(co 2001-2008 DecisionSoft Limited.
+.br
+Copyright \(co 2004-2008 Oracle.
+.PP
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+<http://www.apache.org/licenses/LICENSE-2.0>
+.PP
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+.SH "SEE ALSO"
+The full documentation for the
+.B XQilla library
+is available at <http://xqilla.sourceforge.net/Documentation>.
diff --git a/xqilla.spec b/xqilla.spec
index 5dd3e4b..750c938 100644
--- a/xqilla.spec
+++ b/xqilla.spec
@@ -1,33 +1,41 @@
 Name:           xqilla
-Version:        2.2.3
-Release:        9%{?dist}
-Summary:        XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
+Version:        2.2.4
+Release:        2%{?dist}
+Summary:        XQuery and XPath 2.0 library, built on top of Xerces-C
 
 Group:          System Environment/Libraries
 License:        ASL 2.0
 URL:            http://xqilla.sourceforge.net/HomePage
 Source0:        http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
+Source1:        xqilla.1
+# patch applied upstream
+# http://xqilla.hg.sourceforge.net/hgweb/xqilla/xqilla/rev/a7d2d8d941ad
+Patch0:         xqilla-2.2.4-gcc46.patch
+# since header xqc.h is provided by xqc
+Patch1:         xqilla-2.2.4-use-system-xqc.h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xerces-c-devel >= 3.0.1 
+BuildRequires:  xqc
 BuildRequires:  doxygen graphviz
 
 %description
 XQilla is an XQuery and XPath 2.0 implementation written in C++ and based
 on Xerces-C. It implements the DOM 3 XPath API, as well as having it's own
-more powerful API. It conforms to the W3C proposed recomendation of XQuery
+more powerful API. It conforms to the W3C proposed recommendation of XQuery
 and XPath 2.0.
 
 %package        devel
 Summary:        XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       xerces-c-devel >= 3.0.1
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       xerces-c-devel%{?_isa} >= 3.0.1
+Requires:       xqc
 
 %description    devel
 XQilla is an XQuery and XPath 2.0 implementation written in C++ and based
 on Xerces-C. It implements the DOM 3 XPath API, as well as having it's own
-more powerful API. It conforms to the W3C proposed recomendation of XQuery
+more powerful API. It conforms to the W3C proposed recommendation of XQuery
 and XPath 2.0.
 
 %package        doc
@@ -40,8 +48,12 @@ simple-api and dom3-api documentation for XQilla.
 
 %prep
 %setup -qn XQilla-%{version}
+%patch0 -p1 -b .gcc46
+%patch1 -p1 -b .xqc
 
 %build
+# ensure that xqc.h is not used
+rm -f ./include/xqc.h
 %configure \
   --disable-static \
   --with-xerces=%{_prefix}
@@ -55,8 +67,10 @@ make docs
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+# force timestamp preservation when using install program
+make install DESTDIR=%{buildroot} INSTALL="install -p"
 find %{buildroot} -name '*.la' -exec rm -f '{}' ';'
+install -D -p -m0664 %{SOURCE1} %{buildroot}/%{_mandir}/man1/%{name}.1
 
 %clean
 rm -rf %{buildroot}
@@ -70,19 +84,31 @@ rm -rf %{buildroot}
 %doc ChangeLog LICENSE
 %{_bindir}/xqilla
 %{_libdir}/libxqilla.so.*
+%{_mandir}/man1/%{name}.1.*
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libxqilla.so
 %{_includedir}/xqilla/
-%{_includedir}/xqc.h
 
 %files doc
 %defattr(-,root,root,-)
-%doc docs/dom3-api/ docs/simple-api/
+%doc docs/dom3-api/ docs/simple-api/ LICENSE
 
 
 %changelog
+* Fri Aug 05 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.2.4-2
+- revive xqilla from deprecated
+- add man page from debian for xqilla command-line tool
+- do not install bundled xqc.h and Requires: xqc
+
+* Thu Mar 10 2011 Kalev Lember <kalev at smartlink.ee> - 2.2.4-1
+- Update to 2.2.4
+- Added a patch to fix build with GCC 4.6
+
+* Thu Mar 10 2011 Kalev Lember <kalev at smartlink.ee> - 2.2.3-10
+- Rebuilt with xerces-c 3.1
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
