From 9740be88afe916fc8ae72a2edc7e371333038fa6 Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Tue, 18 Dec 2007 18:34:49 +0000 Subject: [PATCH 01/13] Initial xqilla10 ver. 1.0.2 commit --- .cvsignore | 2 + sources | 2 + xqilla10-10-namespace.patch | 25 ++++++++ xqilla10-xercesc-libdir.patch | 29 ++++++++++ xqilla10.spec | 106 ++++++++++++++++++++++++++++++++++ 5 files changed, 164 insertions(+) create mode 100644 xqilla10-10-namespace.patch create mode 100644 xqilla10-xercesc-libdir.patch create mode 100644 xqilla10.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f847ce2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +XQilla-1.0.2.tar.gz +xerces-c-src_2_7_0.tar.gz diff --git a/sources b/sources index e69de29..f2785a3 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +250d35756fc341860afcf4732bbd7b10 XQilla-1.0.2.tar.gz +9f56dc088d21d96c56640f187b60c602 xerces-c-src_2_7_0.tar.gz diff --git a/xqilla10-10-namespace.patch b/xqilla10-10-namespace.patch new file mode 100644 index 0000000..41c4021 --- /dev/null +++ b/xqilla10-10-namespace.patch @@ -0,0 +1,25 @@ +--- Makefile.am ++++ Makefile.am +@@ -3,18 +3,18 @@ + + INCLUDES = -I$(top_srcdir)/include/ -I$(xerces_include) -I$(top_srcdir)/src/lexer/ + LDFLAGS = -L$(xerces_lib) -R$(xerces_lib) +-LDADD = libxqilla.la ++LDADD = libxqilla10.la + + bin_PROGRAMS = xqilla + noinst_PROGRAMS = basicXQillaUsage xqtsRunner + +-lib_LTLIBRARIES = libxqilla.la ++lib_LTLIBRARIES = libxqilla10.la + + # Library version, see http://sourceware.org/autobook/autobook/autobook_91.html + # -no-undefined for Cygwin (bug #1639669) +-libxqilla_la_LDFLAGS = -version-info 1:1:0 -no-undefined -lxerces-c ++libxqilla10_la_LDFLAGS = -version-info 1:1:0 -no-undefined -lxerces-c + +-libxqilla_la_SOURCES = \ ++libxqilla10_la_SOURCES = \ + src/framework/ReferenceCounted.cpp \ + src/framework/BaseMemoryManager.cpp \ + src/framework/ProxyMemoryManager.cpp \ diff --git a/xqilla10-xercesc-libdir.patch b/xqilla10-xercesc-libdir.patch new file mode 100644 index 0000000..ccbb77f --- /dev/null +++ b/xqilla10-xercesc-libdir.patch @@ -0,0 +1,29 @@ +--- configure.in 2007-01-09 02:14:37.000000000 +0100 ++++ configure.in 2007-11-10 22:27:28.000000000 +0100 +@@ -69,18 +69,18 @@ + if test "$with_xerces" = "no"; then + with_xerces="/usr/local" + fi +-if test `ls $with_xerces/lib/libxerces-c.*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then +- AC_MSG_CHECKING([for Xerces C++ version from source tree]) +- xerces_version=`ls "$with_xerces"/lib/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` ++if test `ls $libdir/libxerces-c.*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then ++ AC_MSG_CHECKING([for Xerces C++ version from installed library]) ++ xerces_version=`ls "$libdir"/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` + AC_MSG_RESULT([$xerces_version]) +- xerces_lib="$with_xerces/lib" ++ xerces_lib="$libdir" + xerces_include="$with_xerces/src" + xerces_library="xerces-c" +-elif test `ls $with_xerces/lib/libxerces-c*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then +- AC_MSG_CHECKING([for Xerces C++ version from source tree]) +- xerces_version=`ls "$with_xerces"/lib/libxerces-c*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` ++elif test `ls $libdir/libxerces-c*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then ++ AC_MSG_CHECKING([for Xerces C++ version from installed library]) ++ xerces_version=`ls "$libdir"/libxerces-c*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` + AC_MSG_RESULT([$xerces_version]) +- xerces_lib="$with_xerces/lib" ++ xerces_lib="$libdir" + xerces_include="$with_xerces/src" + xerces_library="xerces-c" + else diff --git a/xqilla10.spec b/xqilla10.spec new file mode 100644 index 0000000..f3f21a9 --- /dev/null +++ b/xqilla10.spec @@ -0,0 +1,106 @@ +%define _unpackaged_files_terminate_build 1 +%define _missing_doc_files_terminate_build 1 + +%define xqilla_release 2 +%define xercesc_dir xerces-c-src_2_7_0 + +Name: xqilla10 +Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C +Group: System Environment/Libraries +Version: 1.0.2 +Release: %{xqilla_release}%{?dist} +License: BSD +URL: http://xqilla.sourceforge.net/HomePage +Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz +Source1: http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz +Requires: libstdc++ >= 4.1.1 xerces-c >= 2.7.0 + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build +BuildRequires: xerces-c-devel >= 2.7.0 +BuildRequires: autoconf automake libtool + +Patch0: xqilla10-xercesc-libdir.patch +Patch1: xqilla10-10-namespace.patch + +%define xercesc_build_root %{_builddir}/%{xercesc_dir} + +%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 +and XPath 2.0. + +%package devel +Group: Development/Libraries +Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C +Requires: %{name} = %{version}-%{release} xerces-c-devel = 2.7.0 + +%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 +and XPath 2.0. + +%prep +%setup -q -b 1 -n XQilla-1.0.2 +%patch0 +%patch1 + +%build +rm -f aclocal.m4 +aclocal +libtoolize --force --copy +automake --add-missing --copy --force +autoconf +%configure \ + --disable-static \ + --disable-rpath \ + --with-xerces=%{xercesc_build_root} \ + --program-suffix="10" +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +make + +%install +rm -rf %{buildroot} +export CPPROG="cp -p" +make install DESTDIR=%{buildroot} +mkdir %{buildroot}%{_includedir}/xqilla10 +mv %{buildroot}%{_includedir}/xqilla %{buildroot}%{_includedir}/xqilla10 +find %{buildroot} -name '*.la' -exec rm -f '{}' ';' +mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} +cp -pr LICENSE* %{buildroot}%{_defaultdocdir}/%{name}-%{version} + +%clean +rm -rf %{buildroot} + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_bindir}/xqilla10 +%{_libdir}/libxqilla10.so.* +%{_defaultdocdir}/%{name}-%{version} + +%files devel +%defattr(-,root,root,-) +%{_libdir}/libxqilla10.so +%{_includedir}/xqilla10 + +%changelog +* Sun Dec 16 2007 Milan Zazrivec - 1.0.2-2 +- xqilla102 renamed to xqilla10 + +* Wed Dec 12 2007 Milan Zazrivec - 1.0.2-2 +- adopted XQilla 1.0.2 from upstream with new MAPM library license +- xqilla101 renamed to xqilla102 + +* Mon Nov 12 2007 Milan Zazrivec - 1.0.1-4 +- xqilla renamed to xqilla101 +- libxqilla renamed to libxqilla101 +- include files moved to /usr/include/xqilla101 + +* Sat Nov 10 2007 Milan Zazrivec - 1.0.1-3 +- Initial packaging From 3eca770cab705d9d4d8245a5017af88947591177 Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Tue, 12 Feb 2008 15:46:05 +0000 Subject: [PATCH 02/13] Use Xerces-C ver. 2.8.0 --- .cvsignore | 2 +- sources | 2 +- xqilla10-xercesc-libdir.patch | 4 ++-- xqilla10.spec | 7 +++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index f847ce2..52543dc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ +xerces-c-src_2_8_0.tar.gz XQilla-1.0.2.tar.gz -xerces-c-src_2_7_0.tar.gz diff --git a/sources b/sources index f2785a3..b0607b1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +5daf514b73f3e0de9e3fce704387c0d2 xerces-c-src_2_8_0.tar.gz 250d35756fc341860afcf4732bbd7b10 XQilla-1.0.2.tar.gz -9f56dc088d21d96c56640f187b60c602 xerces-c-src_2_7_0.tar.gz diff --git a/xqilla10-xercesc-libdir.patch b/xqilla10-xercesc-libdir.patch index ccbb77f..8840c6f 100644 --- a/xqilla10-xercesc-libdir.patch +++ b/xqilla10-xercesc-libdir.patch @@ -7,7 +7,7 @@ -if test `ls $with_xerces/lib/libxerces-c.*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then - AC_MSG_CHECKING([for Xerces C++ version from source tree]) - xerces_version=`ls "$with_xerces"/lib/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` -+if test `ls $libdir/libxerces-c.*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then ++if test `ls $libdir/libxerces-c.*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then + AC_MSG_CHECKING([for Xerces C++ version from installed library]) + xerces_version=`ls "$libdir"/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` AC_MSG_RESULT([$xerces_version]) @@ -18,7 +18,7 @@ -elif test `ls $with_xerces/lib/libxerces-c*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then - AC_MSG_CHECKING([for Xerces C++ version from source tree]) - xerces_version=`ls "$with_xerces"/lib/libxerces-c*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` -+elif test `ls $libdir/libxerces-c*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then ++elif test `ls $libdir/libxerces-c*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then + AC_MSG_CHECKING([for Xerces C++ version from installed library]) + xerces_version=`ls "$libdir"/libxerces-c*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` AC_MSG_RESULT([$xerces_version]) diff --git a/xqilla10.spec b/xqilla10.spec index f3f21a9..faef3c6 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -1,7 +1,7 @@ %define _unpackaged_files_terminate_build 1 %define _missing_doc_files_terminate_build 1 -%define xqilla_release 2 +%define xqilla_release 3 %define xercesc_dir xerces-c-src_2_7_0 Name: xqilla10 @@ -12,7 +12,7 @@ Release: %{xqilla_release}%{?dist} License: BSD URL: http://xqilla.sourceforge.net/HomePage Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz -Source1: http://archive.apache.org/dist/xml/xerces-c/Xerces-C_2_7_0/source/xerces-c-src_2_7_0.tar.gz +Source1: http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz Requires: libstdc++ >= 4.1.1 xerces-c >= 2.7.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build @@ -90,6 +90,9 @@ rm -rf %{buildroot} %{_includedir}/xqilla10 %changelog +* Tue Feb 12 2008 MIlan Zazrivec - 1.0.2-3 +- Use Xerces-C ver. 2.8.0 + * Sun Dec 16 2007 Milan Zazrivec - 1.0.2-2 - xqilla102 renamed to xqilla10 From 860c139407726a2cbe02138bfb93815121d18d1c Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Tue, 12 Feb 2008 15:57:16 +0000 Subject: [PATCH 03/13] Use xerces-c-src_2_8_0 rather than xerces-c-src_2_7_0 for xerces-c source dir --- xqilla10.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xqilla10.spec b/xqilla10.spec index faef3c6..da075db 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -2,7 +2,7 @@ %define _missing_doc_files_terminate_build 1 %define xqilla_release 3 -%define xercesc_dir xerces-c-src_2_7_0 +%define xercesc_dir xerces-c-src_2_8_0 Name: xqilla10 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C From 66c4a7739cb6032a83936b93f4a0b4d4c0400957 Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Tue, 12 Feb 2008 16:21:50 +0000 Subject: [PATCH 04/13] Fixed inclusion of Xerces-C 2.8.0 Attributes class --- xqilla10-xercesc-attributes.patch | 10 ++++++++++ xqilla10.spec | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 xqilla10-xercesc-attributes.patch diff --git a/xqilla10-xercesc-attributes.patch b/xqilla10-xercesc-attributes.patch new file mode 100644 index 0000000..9630e76 --- /dev/null +++ b/xqilla10-xercesc-attributes.patch @@ -0,0 +1,10 @@ +--- src/xqts/TestSuiteParser.cpp.old 2008-02-12 17:05:33.000000000 +0100 ++++ src/xqts/TestSuiteParser.cpp 2008-02-12 17:14:14.000000000 +0100 +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/xqilla10.spec b/xqilla10.spec index da075db..9b6bbb5 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -21,6 +21,7 @@ BuildRequires: autoconf automake libtool Patch0: xqilla10-xercesc-libdir.patch Patch1: xqilla10-10-namespace.patch +Patch2: xqilla10-xercesc-attributes.patch %define xercesc_build_root %{_builddir}/%{xercesc_dir} @@ -45,6 +46,7 @@ and XPath 2.0. %setup -q -b 1 -n XQilla-1.0.2 %patch0 %patch1 +%patch2 %build rm -f aclocal.m4 From 860605a1b9024bbd2606b8c93b6999d7f0d4e82a Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Tue, 19 Feb 2008 12:50:20 +0000 Subject: [PATCH 05/13] Add few #include lines needed to build properly with g++ ver. 4.3 --- xqilla10-cstring.patch | 10 ++++++++++ xqilla10-xercesc-attributes.patch | 15 +++++++++------ xqilla10.spec | 11 ++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 xqilla10-cstring.patch diff --git a/xqilla10-cstring.patch b/xqilla10-cstring.patch new file mode 100644 index 0000000..e642041 --- /dev/null +++ b/xqilla10-cstring.patch @@ -0,0 +1,10 @@ +--- include/xqilla/framework/StringPool.hpp 2007-11-28 14:13:22.000000000 +0100 ++++ include/xqilla/framework/StringPool.hpp 2008-02-19 12:59:59.000000000 +0100 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + class XQILLA_API StringPool + { diff --git a/xqilla10-xercesc-attributes.patch b/xqilla10-xercesc-attributes.patch index 9630e76..1643c41 100644 --- a/xqilla10-xercesc-attributes.patch +++ b/xqilla10-xercesc-attributes.patch @@ -1,10 +1,13 @@ ---- src/xqts/TestSuiteParser.cpp.old 2008-02-12 17:05:33.000000000 +0100 -+++ src/xqts/TestSuiteParser.cpp 2008-02-12 17:14:14.000000000 +0100 -@@ -24,6 +24,7 @@ +--- src/xqts/TestSuiteParser.cpp 2007-12-13 00:55:43.000000000 +0100 ++++ src/xqts/TestSuiteParser.cpp 2008-02-19 13:36:39.000000000 +0100 +@@ -20,8 +20,10 @@ + #include + + #include ++#include + #include ++#include #include #include -+#include - #include - #include diff --git a/xqilla10.spec b/xqilla10.spec index 9b6bbb5..af0da46 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -1,7 +1,7 @@ %define _unpackaged_files_terminate_build 1 %define _missing_doc_files_terminate_build 1 -%define xqilla_release 3 +%define xqilla_release 4 %define xercesc_dir xerces-c-src_2_8_0 Name: xqilla10 @@ -21,7 +21,8 @@ BuildRequires: autoconf automake libtool Patch0: xqilla10-xercesc-libdir.patch Patch1: xqilla10-10-namespace.patch -Patch2: xqilla10-xercesc-attributes.patch +Patch2: xqilla10-cstring.patch +Patch3: xqilla10-xercesc-attributes.patch %define xercesc_build_root %{_builddir}/%{xercesc_dir} @@ -47,6 +48,7 @@ and XPath 2.0. %patch0 %patch1 %patch2 +%patch3 %build rm -f aclocal.m4 @@ -92,7 +94,10 @@ rm -rf %{buildroot} %{_includedir}/xqilla10 %changelog -* Tue Feb 12 2008 MIlan Zazrivec - 1.0.2-3 +* Tue Feb 19 2008 Milan Zazrivec - 1.0.2-4 +- Add few #include lines needed to build properly with g++ 4.3 + +* Tue Feb 12 2008 Milan Zazrivec - 1.0.2-3 - Use Xerces-C ver. 2.8.0 * Sun Dec 16 2007 Milan Zazrivec - 1.0.2-2 From cde8e037839fb1d35de9f327bd61432b4110edc6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 15:48:25 +0000 Subject: [PATCH 06/13] - Autorebuild for GCC 4.3 --- xqilla10.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xqilla10.spec b/xqilla10.spec index af0da46..59d88e0 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -94,6 +94,9 @@ rm -rf %{buildroot} %{_includedir}/xqilla10 %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-4 +- Autorebuild for GCC 4.3 + * Tue Feb 19 2008 Milan Zazrivec - 1.0.2-4 - Add few #include lines needed to build properly with g++ 4.3 From c05a1affec6f55128559cb5ff02d19bdc2e1fed8 Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Wed, 20 Feb 2008 11:29:14 +0000 Subject: [PATCH 07/13] Fix Requires: value for xqilla10-devel --- xqilla10.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xqilla10.spec b/xqilla10.spec index 59d88e0..1295309 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -1,7 +1,7 @@ %define _unpackaged_files_terminate_build 1 %define _missing_doc_files_terminate_build 1 -%define xqilla_release 4 +%define xqilla_release 5 %define xercesc_dir xerces-c-src_2_8_0 Name: xqilla10 @@ -35,7 +35,7 @@ and XPath 2.0. %package devel Group: Development/Libraries Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C -Requires: %{name} = %{version}-%{release} xerces-c-devel = 2.7.0 +Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.7.0 %description devel XQilla is an XQuery and XPath 2.0 implementation written in C++ and based @@ -94,6 +94,9 @@ rm -rf %{buildroot} %{_includedir}/xqilla10 %changelog +* Wed Feb 20 2008 Milan Zazrivec - 1.0.2-5 +- Fix Requires: value for xqilla10-devel + * Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-4 - Autorebuild for GCC 4.3 From 879fdd5fac09ced32461a30480ff97164ce70462 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 11:58:20 +0000 Subject: [PATCH 08/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xqilla10.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xqilla10.spec b/xqilla10.spec index 1295309..02d03e2 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -8,7 +8,7 @@ Name: xqilla10 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C Group: System Environment/Libraries Version: 1.0.2 -Release: %{xqilla_release}%{?dist} +Release: %{xqilla_release}%{?dist}.1 License: BSD URL: http://xqilla.sourceforge.net/HomePage Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz @@ -94,6 +94,9 @@ rm -rf %{buildroot} %{_includedir}/xqilla10 %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 1.0.2-5.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Wed Feb 20 2008 Milan Zazrivec - 1.0.2-5 - Fix Requires: value for xqilla10-devel From 1164254de6651736a69d4c45c73a88e496efa9ae Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Apr 2009 14:04:57 +0000 Subject: [PATCH 09/13] Added a few #include lines needed to build properly with g++ 4.4 --- xqilla10-cstdio.patch | 23 +++++++++++++++++++++++ xqilla10.spec | 9 +++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 xqilla10-cstdio.patch diff --git a/xqilla10-cstdio.patch b/xqilla10-cstdio.patch new file mode 100644 index 0000000..83fe983 --- /dev/null +++ b/xqilla10-cstdio.patch @@ -0,0 +1,23 @@ +Patch by Robert Scheck for xqilla >= 1.0.2, that +adds a few #include lines needed to build properly with g++ version 4.4. + +--- src/items/Numeric.cpp 2007-12-13 00:55:40.000000000 +0100 ++++ src/items/Numeric.cpp.cstdio 2009-04-13 15:32:12.000000000 +0200 +@@ -11,6 +11,7 @@ + * $Id: Numeric.cpp,v 1.15 2006/11/01 16:37:20 jpcs Exp $ + */ + ++#include + #include + + #include "../config/xqilla_config.h" +--- src/lexer/XQLexer.hpp 2007-12-13 00:55:41.000000000 +0100 ++++ src/lexer/XQLexer.hpp.cstdio 2009-04-13 15:50:14.000000000 +0200 +@@ -22,6 +22,7 @@ + #include "FlexLexer.h" + #endif + ++#include + #include + #include + #include diff --git a/xqilla10.spec b/xqilla10.spec index 02d03e2..6fd3d7e 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -1,14 +1,14 @@ %define _unpackaged_files_terminate_build 1 %define _missing_doc_files_terminate_build 1 -%define xqilla_release 5 +%define xqilla_release 6 %define xercesc_dir xerces-c-src_2_8_0 Name: xqilla10 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C Group: System Environment/Libraries Version: 1.0.2 -Release: %{xqilla_release}%{?dist}.1 +Release: %{xqilla_release}%{?dist} License: BSD URL: http://xqilla.sourceforge.net/HomePage Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz @@ -23,6 +23,7 @@ Patch0: xqilla10-xercesc-libdir.patch Patch1: xqilla10-10-namespace.patch Patch2: xqilla10-cstring.patch Patch3: xqilla10-xercesc-attributes.patch +Patch4: xqilla10-cstdio.patch %define xercesc_build_root %{_builddir}/%{xercesc_dir} @@ -49,6 +50,7 @@ and XPath 2.0. %patch1 %patch2 %patch3 +%patch4 %build rm -f aclocal.m4 @@ -94,6 +96,9 @@ rm -rf %{buildroot} %{_includedir}/xqilla10 %changelog +* Mon Apr 13 2009 Robert Scheck - 1.0.2-6 +- Added a few #include lines needed to build properly with g++ 4.4 + * Thu Feb 26 2009 Fedora Release Engineering - 1.0.2-5.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From a2cc794f7c06003a33c631b0c0f2f15279fa0223 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:43:16 +0000 Subject: [PATCH 10/13] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xqilla10.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xqilla10.spec b/xqilla10.spec index 6fd3d7e..cce9f4c 100644 --- a/xqilla10.spec +++ b/xqilla10.spec @@ -8,7 +8,7 @@ Name: xqilla10 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C Group: System Environment/Libraries Version: 1.0.2 -Release: %{xqilla_release}%{?dist} +Release: %{xqilla_release}%{?dist}.1 License: BSD URL: http://xqilla.sourceforge.net/HomePage Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz @@ -96,6 +96,9 @@ rm -rf %{buildroot} %{_includedir}/xqilla10 %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 1.0.2-6.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Apr 13 2009 Robert Scheck - 1.0.2-6 - Added a few #include lines needed to build properly with g++ 4.4 From 9a7902c2cb3b98bf5fc361c34e77124293431920 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:41:06 +0000 Subject: [PATCH 11/13] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4d65ee3..bf4de81 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xqilla10 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 13f8a0085f9f7850b78f14364d21d526d7421abf Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 9 Feb 2010 19:08:32 +0000 Subject: [PATCH 12/13] Orphan Cleanup --- Makefile | 21 ----- dead.package | 1 + sources | 2 - xqilla10-10-namespace.patch | 25 ------ xqilla10-cstdio.patch | 23 ------ xqilla10-cstring.patch | 10 --- xqilla10-xercesc-attributes.patch | 13 --- xqilla10-xercesc-libdir.patch | 29 ------- xqilla10.spec | 133 ------------------------------ 9 files changed, 1 insertion(+), 256 deletions(-) delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xqilla10-10-namespace.patch delete mode 100644 xqilla10-cstdio.patch delete mode 100644 xqilla10-cstring.patch delete mode 100644 xqilla10-xercesc-attributes.patch delete mode 100644 xqilla10-xercesc-libdir.patch delete mode 100644 xqilla10.spec diff --git a/Makefile b/Makefile deleted file mode 100644 index bf4de81..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xqilla10 -# $Id$ -NAME := xqilla10 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..560e66f --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphan Cleanup diff --git a/sources b/sources deleted file mode 100644 index b0607b1..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -5daf514b73f3e0de9e3fce704387c0d2 xerces-c-src_2_8_0.tar.gz -250d35756fc341860afcf4732bbd7b10 XQilla-1.0.2.tar.gz diff --git a/xqilla10-10-namespace.patch b/xqilla10-10-namespace.patch deleted file mode 100644 index 41c4021..0000000 --- a/xqilla10-10-namespace.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- Makefile.am -+++ Makefile.am -@@ -3,18 +3,18 @@ - - INCLUDES = -I$(top_srcdir)/include/ -I$(xerces_include) -I$(top_srcdir)/src/lexer/ - LDFLAGS = -L$(xerces_lib) -R$(xerces_lib) --LDADD = libxqilla.la -+LDADD = libxqilla10.la - - bin_PROGRAMS = xqilla - noinst_PROGRAMS = basicXQillaUsage xqtsRunner - --lib_LTLIBRARIES = libxqilla.la -+lib_LTLIBRARIES = libxqilla10.la - - # Library version, see http://sourceware.org/autobook/autobook/autobook_91.html - # -no-undefined for Cygwin (bug #1639669) --libxqilla_la_LDFLAGS = -version-info 1:1:0 -no-undefined -lxerces-c -+libxqilla10_la_LDFLAGS = -version-info 1:1:0 -no-undefined -lxerces-c - --libxqilla_la_SOURCES = \ -+libxqilla10_la_SOURCES = \ - src/framework/ReferenceCounted.cpp \ - src/framework/BaseMemoryManager.cpp \ - src/framework/ProxyMemoryManager.cpp \ diff --git a/xqilla10-cstdio.patch b/xqilla10-cstdio.patch deleted file mode 100644 index 83fe983..0000000 --- a/xqilla10-cstdio.patch +++ /dev/null @@ -1,23 +0,0 @@ -Patch by Robert Scheck for xqilla >= 1.0.2, that -adds a few #include lines needed to build properly with g++ version 4.4. - ---- src/items/Numeric.cpp 2007-12-13 00:55:40.000000000 +0100 -+++ src/items/Numeric.cpp.cstdio 2009-04-13 15:32:12.000000000 +0200 -@@ -11,6 +11,7 @@ - * $Id: Numeric.cpp,v 1.15 2006/11/01 16:37:20 jpcs Exp $ - */ - -+#include - #include - - #include "../config/xqilla_config.h" ---- src/lexer/XQLexer.hpp 2007-12-13 00:55:41.000000000 +0100 -+++ src/lexer/XQLexer.hpp.cstdio 2009-04-13 15:50:14.000000000 +0200 -@@ -22,6 +22,7 @@ - #include "FlexLexer.h" - #endif - -+#include - #include - #include - #include diff --git a/xqilla10-cstring.patch b/xqilla10-cstring.patch deleted file mode 100644 index e642041..0000000 --- a/xqilla10-cstring.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- include/xqilla/framework/StringPool.hpp 2007-11-28 14:13:22.000000000 +0100 -+++ include/xqilla/framework/StringPool.hpp 2008-02-19 12:59:59.000000000 +0100 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - class XQILLA_API StringPool - { diff --git a/xqilla10-xercesc-attributes.patch b/xqilla10-xercesc-attributes.patch deleted file mode 100644 index 1643c41..0000000 --- a/xqilla10-xercesc-attributes.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/xqts/TestSuiteParser.cpp 2007-12-13 00:55:43.000000000 +0100 -+++ src/xqts/TestSuiteParser.cpp 2008-02-19 13:36:39.000000000 +0100 -@@ -20,8 +20,10 @@ - #include - - #include -+#include - - #include -+#include - #include - #include - diff --git a/xqilla10-xercesc-libdir.patch b/xqilla10-xercesc-libdir.patch deleted file mode 100644 index 8840c6f..0000000 --- a/xqilla10-xercesc-libdir.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.in 2007-01-09 02:14:37.000000000 +0100 -+++ configure.in 2007-11-10 22:27:28.000000000 +0100 -@@ -69,18 +69,18 @@ - if test "$with_xerces" = "no"; then - with_xerces="/usr/local" - fi --if test `ls $with_xerces/lib/libxerces-c.*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then -- AC_MSG_CHECKING([for Xerces C++ version from source tree]) -- xerces_version=`ls "$with_xerces"/lib/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` -+if test `ls $libdir/libxerces-c.*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then -+ AC_MSG_CHECKING([for Xerces C++ version from installed library]) -+ xerces_version=`ls "$libdir"/libxerces-c.*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c.*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` - AC_MSG_RESULT([$xerces_version]) -- xerces_lib="$with_xerces/lib" -+ xerces_lib="$libdir" - xerces_include="$with_xerces/src" - xerces_library="xerces-c" --elif test `ls $with_xerces/lib/libxerces-c*2[[6-7]].* 2>/dev/null | wc -l` -gt 0 ; then -- AC_MSG_CHECKING([for Xerces C++ version from source tree]) -- xerces_version=`ls "$with_xerces"/lib/libxerces-c*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` -+elif test `ls $libdir/libxerces-c*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then -+ AC_MSG_CHECKING([for Xerces C++ version from installed library]) -+ xerces_version=`ls "$libdir"/libxerces-c*[[0-9]][[0-9]].* | tail -1 | sed 's/.*xerces-c*\([[0-9]]\)\([[0-9]]\).*/\1.\2/'` - AC_MSG_RESULT([$xerces_version]) -- xerces_lib="$with_xerces/lib" -+ xerces_lib="$libdir" - xerces_include="$with_xerces/src" - xerces_library="xerces-c" - else diff --git a/xqilla10.spec b/xqilla10.spec deleted file mode 100644 index cce9f4c..0000000 --- a/xqilla10.spec +++ /dev/null @@ -1,133 +0,0 @@ -%define _unpackaged_files_terminate_build 1 -%define _missing_doc_files_terminate_build 1 - -%define xqilla_release 6 -%define xercesc_dir xerces-c-src_2_8_0 - -Name: xqilla10 -Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C -Group: System Environment/Libraries -Version: 1.0.2 -Release: %{xqilla_release}%{?dist}.1 -License: BSD -URL: http://xqilla.sourceforge.net/HomePage -Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz -Source1: http://www.apache.org/dist/xerces/c/sources/xerces-c-src_2_8_0.tar.gz -Requires: libstdc++ >= 4.1.1 xerces-c >= 2.7.0 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build -BuildRequires: xerces-c-devel >= 2.7.0 -BuildRequires: autoconf automake libtool - -Patch0: xqilla10-xercesc-libdir.patch -Patch1: xqilla10-10-namespace.patch -Patch2: xqilla10-cstring.patch -Patch3: xqilla10-xercesc-attributes.patch -Patch4: xqilla10-cstdio.patch - -%define xercesc_build_root %{_builddir}/%{xercesc_dir} - -%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 -and XPath 2.0. - -%package devel -Group: Development/Libraries -Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C -Requires: %{name} = %{version}-%{release} xerces-c-devel >= 2.7.0 - -%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 -and XPath 2.0. - -%prep -%setup -q -b 1 -n XQilla-1.0.2 -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 - -%build -rm -f aclocal.m4 -aclocal -libtoolize --force --copy -automake --add-missing --copy --force -autoconf -%configure \ - --disable-static \ - --disable-rpath \ - --with-xerces=%{xercesc_build_root} \ - --program-suffix="10" -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make - -%install -rm -rf %{buildroot} -export CPPROG="cp -p" -make install DESTDIR=%{buildroot} -mkdir %{buildroot}%{_includedir}/xqilla10 -mv %{buildroot}%{_includedir}/xqilla %{buildroot}%{_includedir}/xqilla10 -find %{buildroot} -name '*.la' -exec rm -f '{}' ';' -mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version} -cp -pr LICENSE* %{buildroot}%{_defaultdocdir}/%{name}-%{version} - -%clean -rm -rf %{buildroot} - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%{_bindir}/xqilla10 -%{_libdir}/libxqilla10.so.* -%{_defaultdocdir}/%{name}-%{version} - -%files devel -%defattr(-,root,root,-) -%{_libdir}/libxqilla10.so -%{_includedir}/xqilla10 - -%changelog -* Mon Jul 27 2009 Fedora Release Engineering - 1.0.2-6.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Apr 13 2009 Robert Scheck - 1.0.2-6 -- Added a few #include lines needed to build properly with g++ 4.4 - -* Thu Feb 26 2009 Fedora Release Engineering - 1.0.2-5.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 20 2008 Milan Zazrivec - 1.0.2-5 -- Fix Requires: value for xqilla10-devel - -* Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-4 -- Autorebuild for GCC 4.3 - -* Tue Feb 19 2008 Milan Zazrivec - 1.0.2-4 -- Add few #include lines needed to build properly with g++ 4.3 - -* Tue Feb 12 2008 Milan Zazrivec - 1.0.2-3 -- Use Xerces-C ver. 2.8.0 - -* Sun Dec 16 2007 Milan Zazrivec - 1.0.2-2 -- xqilla102 renamed to xqilla10 - -* Wed Dec 12 2007 Milan Zazrivec - 1.0.2-2 -- adopted XQilla 1.0.2 from upstream with new MAPM library license -- xqilla101 renamed to xqilla102 - -* Mon Nov 12 2007 Milan Zazrivec - 1.0.1-4 -- xqilla renamed to xqilla101 -- libxqilla renamed to libxqilla101 -- include files moved to /usr/include/xqilla101 - -* Sat Nov 10 2007 Milan Zazrivec - 1.0.1-3 -- Initial packaging From d207802db403f58eba5670f9ffa4b4896486fc4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:11:13 +0000 Subject: [PATCH 13/13] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore