Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Fedora Release Engineering
d207802db4 dist-git conversion 2010-07-29 16:11:13 +00:00
Jesse Keating
13f8a0085f Orphan Cleanup 2010-02-09 19:08:32 +00:00
Bill Nottingham
9a7902c2cb Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-25 22:41:06 +00:00
10 changed files with 1 additions and 256 deletions

View file

View file

@ -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 $$/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)

1
dead.package Normal file
View file

@ -0,0 +1 @@
Orphan Cleanup

View file

@ -1,2 +0,0 @@
5daf514b73f3e0de9e3fce704387c0d2 xerces-c-src_2_8_0.tar.gz
250d35756fc341860afcf4732bbd7b10 XQilla-1.0.2.tar.gz

View file

@ -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 \

View file

@ -1,23 +0,0 @@
Patch by Robert Scheck <robert@fedoraproject.org> 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 <cstdio>
#include <assert.h>
#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 <cstdio>
#include <xercesc/util/BitSet.hpp>
#include <xercesc/util/RefHashTableOf.hpp>
#include <xqilla/simple-api/XQQuery.hpp>

View file

@ -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 <xercesc/framework/MemoryManager.hpp>
#include <memory>
#include <string>
+#include <cstring>
class XQILLA_API StringPool
{

View file

@ -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 <xqilla/xqts/TestSuiteResultListener.hpp>
#include <iostream>
+#include <stdlib.h>
#include <xercesc/sax2/XMLReaderFactory.hpp>
+#include <xercesc/sax2/Attributes.hpp>
#include <xercesc/framework/URLInputSource.hpp>
#include <xercesc/util/BinFileInputStream.hpp>

View file

@ -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

View file

@ -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 <rel-eng@lists.fedoraproject.org> - 1.0.2-6.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Mon Apr 13 2009 Robert Scheck <robert@fedoraproject.org> - 1.0.2-6
- Added a few #include lines needed to build properly with g++ 4.4
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-5.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Feb 20 2008 Milan Zazrivec <mzazrivec@redhat.com> - 1.0.2-5
- Fix Requires: value for xqilla10-devel
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.2-4
- Autorebuild for GCC 4.3
* Tue Feb 19 2008 Milan Zazrivec <mzazrivec@redhat.com> - 1.0.2-4
- Add few #include lines needed to build properly with g++ 4.3
* Tue Feb 12 2008 Milan Zazrivec <mzazrivec@redhat.com> - 1.0.2-3
- Use Xerces-C ver. 2.8.0
* Sun Dec 16 2007 Milan Zazrivec <mzazrivec@redhat.com> - 1.0.2-2
- xqilla102 renamed to xqilla10
* Wed Dec 12 2007 Milan Zazrivec <mzazrivec@redhat.com> - 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 <mzazrivec@redhat.com> - 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 <mzazrivec@redhat.com> - 1.0.1-3
- Initial packaging