rpms/xqilla10/F-8 xqilla10-10-namespace.patch, NONE, 1.1 xqilla10-xercesc-libdir.patch, NONE, 1.1 xqilla10.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Milan Zazrivec (mzazrive) fedora-extras-commits at redhat.com
Tue Dec 18 19:55:18 UTC 2007


Author: mzazrive

Update of /cvs/pkgs/rpms/xqilla10/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14559/F-8

Modified Files:
	.cvsignore sources 
Added Files:
	xqilla10-10-namespace.patch xqilla10-xercesc-libdir.patch 
	xqilla10.spec 
Log Message:
Initial xqilla10 ver. 1.0.2 F-8 commit


xqilla10-10-namespace.patch:

--- NEW FILE xqilla10-10-namespace.patch ---
--- 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 \

xqilla10-xercesc-libdir.patch:

--- NEW FILE xqilla10-xercesc-libdir.patch ---
--- 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


--- NEW FILE xqilla10.spec ---
%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 <mzazrivec at redhat.com> - 1.0.2-2
- xqilla102 renamed to xqilla10

* Wed Dec 12 2007 Milan Zazrivec <mzazrivec at 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 at 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 at redhat.com> - 1.0.1-3
- Initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla10/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Dec 2007 18:08:15 -0000	1.1
+++ .cvsignore	18 Dec 2007 19:54:43 -0000	1.2
@@ -0,0 +1,2 @@
+XQilla-1.0.2.tar.gz
+xerces-c-src_2_7_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla10/F-8/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Dec 2007 18:08:15 -0000	1.1
+++ sources	18 Dec 2007 19:54:43 -0000	1.2
@@ -0,0 +1,2 @@
+250d35756fc341860afcf4732bbd7b10  XQilla-1.0.2.tar.gz
+9f56dc088d21d96c56640f187b60c602  xerces-c-src_2_7_0.tar.gz




More information about the fedora-extras-commits mailing list