From 896319d61f78af1165a6f7b8df7ff97287e503cf Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 18 Dec 2007 18:08:42 +0000 Subject: [PATCH 1/4] Initialize branch F-8 for xqilla10 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 20b9ee809218d90f76d392dad37840bd5ed719b5 Mon Sep 17 00:00:00 2001 From: Milan Zazrivec Date: Tue, 18 Dec 2007 19:54:43 +0000 Subject: [PATCH 2/4] Initial xqilla10 ver. 1.0.2 F-8 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 50cd4244de0ad01c8c8266b4e797e0e83a73f5c5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:55 +0000 Subject: [PATCH 3/4] 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 5e6a6bfbbc994fd8476e9054e4398ee0353e2032 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:11:11 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore 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/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8