rpms/xqilla/devel import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xqilla-xercesc-libdir.patch, 1.1, 1.2 xqilla.spec, 1.5, 1.6 mapm_mt.c, 1.1, NONE xqilla-cstring.patch, 1.1, NONE

Milan Zazrivec mzazrive at fedoraproject.org
Fri Aug 29 12:23:36 UTC 2008 

Author: mzazrive

Update of /cvs/pkgs/rpms/xqilla/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6474/devel

Modified Files:
	.cvsignore sources xqilla-xercesc-libdir.patch xqilla.spec 
Added Files:
	import.log 
Removed Files:
	mapm_mt.c xqilla-cstring.patch 
Log Message:
Rebased to XQilla 2.1.3



--- NEW FILE import.log ---
xqilla-2_1_3-0_1_fc10:HEAD:xqilla-2.1.3-0.1.fc10.src.rpm:1220012482


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Feb 2008 12:04:04 -0000	1.3
+++ .cvsignore	29 Aug 2008 12:23:06 -0000	1.4
@@ -1,2 +1,2 @@
 xerces-c-src_2_8_0.tar.gz
-XQilla-2.0.0.tar.gz
+XQilla-2.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Feb 2008 12:04:04 -0000	1.3
+++ sources	29 Aug 2008 12:23:06 -0000	1.4
@@ -1,2 +1,2 @@
 5daf514b73f3e0de9e3fce704387c0d2  xerces-c-src_2_8_0.tar.gz
-d7aa51c18a164af2fb54282bb271f0e2  XQilla-2.0.0.tar.gz
+95b46bb8b29674cd1ae56fb5080a5649  XQilla-2.1.3.tar.gz

xqilla-xercesc-libdir.patch:

Index: xqilla-xercesc-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/devel/xqilla-xercesc-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xqilla-xercesc-libdir.patch	10 Jan 2008 17:29:26 -0000	1.1
+++ xqilla-xercesc-libdir.patch	29 Aug 2008 12:23:06 -0000	1.2
@@ -1,37 +1,18 @@
---- configure.in	2007-12-13 02:06:15.000000000 +0100
-+++ configure.in	2008-01-08 15:26:41.000000000 +0100
-@@ -69,18 +69,18 @@
+--- ./configure.in	2008-08-29 13:44:16.000000000 +0200
++++ ./configure.in	2008-08-29 13:45:53.000000000 +0200
+@@ -71,11 +71,11 @@ AC_MSG_RESULT($with_xerces)
  if test "$with_xerces" = "no"; then
          with_xerces="/usr/local"
  fi
 -if test `ls $with_xerces/lib/libxerces-c.*2[[6-8]].* 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 source tree])
+-        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-8]].* 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 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/'`
-+        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
-@@ -162,9 +162,7 @@
- fi
- 
- # Checks for libraries.
--AC_CHECK_LIB(pthread,pthread_create)
- AC_CHECK_LIB(socket,connect)
--AC_CHECK_LIB(nsl,gethostbyname)
- 
- # Checks for header files.
- AC_FUNC_ALLOCA
+         xerces_include_dir="$with_xerces/src"
+         xerces_include="-I$with_xerces/src"
+ elif test `ls $with_xerces/lib/libxerces-c*2[[6-8]].* 2>/dev/null | wc -l` -gt 0 ; then


Index: xqilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xqilla/devel/xqilla.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xqilla.spec	29 Feb 2008 10:59:22 -0000	1.5
+++ xqilla.spec	29 Aug 2008 12:23:06 -0000	1.6
@@ -6,29 +6,22 @@
 Name: xqilla
 Summary: XQilla is an XQuery and XPath 2.0 library, built on top of Xerces-C
 Group: System Environment/Libraries
-Version: 2.0.0
-Release: 5%{?dist}
+Version: 2.1.3
+Release: 0.1%{?dist}
 License: ASL 2.0
 URL: http://xqilla.sourceforge.net/HomePage
-# Original upstream source:
-# Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
-# 
-# Original tarball with src/mapm/mapm_mt.cpp removed (licensing problems)
-Source0: XQilla-%{version}.tar.gz
+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
-# mapm_mt.c is wrapper for mapm library to be used in multithreaded apps.
-# It was taken from MAPM library ver. 4.9.5 and modified to work with
-# XQilla ver. 2.0.0. It's purpose is to replace the removed mapm_mt.cpp.
-Source2: mapm_mt.c
-Requires: libstdc++ >= 4.1.1 xerces-c >= 2.7.0
+
+Requires: libstdc++ >= 4.1.1 xerces-c >= 2.8.0
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build
-BuildRequires: xerces-c-devel >= 2.7.0 
+
+BuildRequires: xerces-c-devel >= 2.8.0 
 BuildRequires: autoconf automake libtool
 BuildRequires: doxygen graphviz
 
-Patch0: xqilla-xercesc-libdir.patch
-Patch1: xqilla-cstring.patch
+Patch1: xqilla-xercesc-libdir.patch
 
 %define xercesc_build_root %{_builddir}/%{xercesc_dir}
 
@@ -57,10 +50,7 @@
 simple-api and dom3-api documentation for XQilla.
 
 %prep
-%setup -q -b 1 -n XQilla-2.0.0
-cp -p %{SOURCE2} src/mapm
-ln -s mapm_mt.c src/mapm/mapm_mt.cpp
-%patch0
+%setup -q -b 1 -n XQilla-%{version}
 %patch1
 
 %build
@@ -86,9 +76,9 @@
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 cp -pr ChangeLog LICENSE %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 cp -pr docs/dom3-api docs/simple-api \
-        %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+	%{buildroot}%{_defaultdocdir}/%{name}-%{version}
 for file in `find %{buildroot}%{_defaultdocdir}/%{name}-%{version}`; do\
-        if ! [ -s "$file" ]; then rm -f "$file"; fi;
+	if ! [ -s "$file" ]; then rm -f "$file"; fi;
 done
 
 %clean
@@ -109,7 +99,15 @@
 %{_libdir}/libxqilla.so
 %{_includedir}/xqilla
 
+%files doc
+%defattr(-,root,root,-)
+%{_defaultdocdir}/%{name}-%{version}/dom3-api
+%{_defaultdocdir}/%{name}-%{version}/simple-api
+
 %changelog
+* Fri Aug 29 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.1.3-0.1
+- Rebased Xqilla to latest upstream version 2.1.3
+
 * Fri Feb 29 2008 Milan Zazrivec <mzazrivec at redhat.com> 2.0.0-5
 - Create xqilla-doc package for xqilla documentation
 


--- mapm_mt.c DELETED ---


--- xqilla-cstring.patch DELETED ---

More information about the fedora-extras-commits mailing list