From 31790b0af3c20bafb6ea8edc33c5ceb72bb268f7 Mon Sep 17 00:00:00 2001 From: Benjamin Beasley Date: Dec 08 2020 16:39:52 +0000 Subject: Work around removed XALAN_USING_XALAN compatibility macro in xalan-c 1.12 --- diff --git a/libdigidocpp.spec b/libdigidocpp.spec index bbfb81b..9549e2b 100644 --- a/libdigidocpp.spec +++ b/libdigidocpp.spec @@ -1,7 +1,7 @@ Name: libdigidocpp Version: 3.14.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library offers creating, signing and verification of digitally signed documents License: LGPLv2+ @@ -52,6 +52,11 @@ The %{name}-doc package contains documentation provided by upstream. %prep %setup -q +# Compatibility macro XALAN_USING_XALAN() was removed in xalan-c 1.12. This +# workaround is harmless when using older xalan-c versions. See +# https://issues.apache.org/jira/browse/SANTUARIO-560. +find . -type f -execdir sed -r -i \ + 's/XALAN_USING_XALAN\(([^\(\)]+)\);*/using xalanc::\1;/g' '{}' '+' # it contains non UTF-8 files, but they do not worth the process of # unpackaging and fixing the encoding @@ -115,6 +120,9 @@ rm -rf src/minizip %changelog +* Tue Dec 8 11:39:09 EST 2020 Benjamin A. Beasley - 3.14.4-3 +- Work around removed XALAN_USING_XALAN compatibility macro in xalan-c 1.12 + * Tue Dec 8 09:07:38 CET 2020 Zbigniew Jędrzejewski-Szmek - 3.14.4-2 - Rebuilt for xalan-c 1.12.0