- updated to 2.3.3

- updated link patch (don't override LDFLAGS as it killed ours, set proper _LIBADD instead)
- updated soname patch (so versioning mistake continued)

diff --git a/xqilla-link.patch b/xqilla-link.patch
index 617e00edbc1fafb9495d153cdc65ed18c3253a56..cfa688d5d1f780232cf92d2242219813a7a67638 100644 (file)
--- 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 7e9585398d5c547878f6e23312493b7a2badb473..7682eb499e1733f9804d8fcd72ea931711517a0b 100644 (file)
--- 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 40150e6b80ce398d03eb098c4d7cad9affc239ed..7fcd03c5ed0244ae777f801d76486bb211f9a760 100644 (file)
--- 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/