summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2016-05-14 09:56:30 (GMT)
committerJakub Bogusz2016-05-14 09:56:30 (GMT)
commit56965b8e22a6a30a68a0cb0f18fc42484df3b1e3 (patch)
tree1bfedbe7782ad004c9fff53a9376b1a94322bea0
parentd531bae82755e7ce8a23fff9277a385abdf34f03 (diff)
downloadxqilla-56965b8e22a6a30a68a0cb0f18fc42484df3b1e3.zip
xqilla-56965b8e22a6a30a68a0cb0f18fc42484df3b1e3.tar.gz
- updated to 2.3.3auto/th/xqilla-2.3.3-1
- updated link patch (don't override LDFLAGS as it killed ours, set proper _LIBADD instead) - updated soname patch (so versioning mistake continued)
-rw-r--r--xqilla-link.patch2
-rw-r--r--xqilla-soname.patch8
-rw-r--r--xqilla.spec4
3 files changed, 7 insertions, 7 deletions
diff --git a/xqilla-link.patch b/xqilla-link.patch
index 617e00e..cfa688d 100644
--- a/xqilla-link.patch
+++ b/xqilla-link.patch
@@ -18,7 +18,7 @@
INCLUDES = -I$(top_srcdir)/include/ $(xerces_include) -I$(top_srcdir)/src/lexer/ $(faxpp_include) $(tidy_include)
-LDFLAGS = -L$(xerces_lib) -R$(xerces_lib) $(faxpp_lib) $(tidy_lib) -lxerces-c $(faxpp_library) $(tidy_library)
-+LDFLAGS = $(faxpp_lib) $(tidy_lib) -lxerces-c $(faxpp_library) $(tidy_library)
++libxqilla_la_LIBADD = $(faxpp_lib) $(tidy_lib) -lxerces-c $(faxpp_library) $(tidy_library)
LDADD = libxqilla.la
ACLOCAL_AMFLAGS = -I autotools/m4
diff --git a/xqilla-soname.patch b/xqilla-soname.patch
index 7e95853..7682eb4 100644
--- a/xqilla-soname.patch
+++ b/xqilla-soname.patch
@@ -1,11 +1,11 @@
---- XQilla-2.3.2/Makefile.am.orig 2016-01-29 20:21:46.349549168 +0100
-+++ XQilla-2.3.2/Makefile.am 2016-01-29 20:52:35.932804878 +0100
+--- XQilla-2.3.3/Makefile.am.orig 2016-05-14 10:35:38.767625802 +0200
++++ XQilla-2.3.3/Makefile.am 2016-05-14 10:36:21.874290660 +0200
@@ -17,7 +17,7 @@
# Library version, see http://sourceware.org/autobook/autobook/autobook_91.html
# -no-undefined for Cygwin (bug #1639669)
--libxqilla_la_LDFLAGS = -version-info 6:0:2 -no-undefined
-+libxqilla_la_LDFLAGS = -version-info 6:2:0 -no-undefined
+-libxqilla_la_LDFLAGS = -version-info 6:0:3 -no-undefined
++libxqilla_la_LDFLAGS = -version-info 6:3:0 -no-undefined
libxqilla_la_SOURCES = \
src/framework/ReferenceCounted.cpp \
diff --git a/xqilla.spec b/xqilla.spec
index 40150e6..7fcd03c 100644
--- a/xqilla.spec
+++ b/xqilla.spec
@@ -5,12 +5,12 @@
Summary: XQilla - C++ implementation of XQuery and XPath 2.0 based on Xerces-C
Summary(pl.UTF-8): XQilla - implementacja C++ XQuary i XPath 2.0 oparta na bibliotece Xerces-C
Name: xqilla
-Version: 2.3.2
+Version: 2.3.3
Release: 1
License: Apache v2.0
Group: Libraries
Source0: http://downloads.sourceforge.net/xqilla/XQilla-%{version}.tar.gz
-# Source0-md5: 66112611a77d633f42abcfd561661b01
+# Source0-md5: 8ece20348687b6529bb934c17067803c
Patch0: %{name}-link.patch
Patch1: %{name}-soname.patch
URL: http://xqilla.sourceforge.net/