diff --git a/SOURCES/multilib2.patch b/SOURCES/multilib2.patch new file mode 100644 index 0000000..22ffe7e --- /dev/null +++ b/SOURCES/multilib2.patch @@ -0,0 +1,28 @@ +diff -urN libxslt-1.1.32/libxslt/xsltconfig.h.in libxslt-1.1.32.completemultilib/libxslt/xsltconfig.h.in +--- libxslt-1.1.32/libxslt/xsltconfig.h.in 2017-10-26 07:55:47.000000000 +0000 ++++ libxslt-1.1.32.completemultilib/libxslt/xsltconfig.h.in 2019-05-06 11:35:57.948191169 +0000 +@@ -120,7 +120,11 @@ + #ifndef WITH_MODULES + #define WITH_MODULES + #endif +-#define LIBXSLT_DEFAULT_PLUGINS_PATH() "@LIBXSLT_DEFAULT_PLUGINS_PATH@" ++#ifdef __LP64__ ++#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/usr/lib64/libxslt-plugins" ++#else ++#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/usr/lib/libxslt-plugins" ++#endif + #endif + + /** +diff -urN libxslt-1.1.32/xslt-config.in libxslt-1.1.32.completemultilib/xslt-config.in +--- libxslt-1.1.32/xslt-config.in 2015-05-10 14:11:30.000000000 +0000 ++++ libxslt-1.1.32.completemultilib/xslt-config.in 2019-05-06 11:34:59.670592304 +0000 +@@ -65,7 +65,7 @@ + ;; + + --plugins) +- echo @LIBXSLT_DEFAULT_PLUGINS_PATH@ ++ echo ${libdir}/libxslt-plugins + exit 0 + ;; + diff --git a/SPECS/libxslt.spec b/SPECS/libxslt.spec index 03e76a1..427d47c 100644 --- a/SPECS/libxslt.spec +++ b/SPECS/libxslt.spec @@ -8,7 +8,7 @@ Name: libxslt Summary: Library providing the Gnome XSLT engine Version: 1.1.32 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://xmlsoft.org/XSLT @@ -25,6 +25,8 @@ BuildRequires: pkgconfig(libxml-2.0) >= 2.6.27 # Fedora specific patches Patch0: multilib.patch Patch1: libxslt-1.1.26-utf8-docs.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1765632 +Patch2: multilib2.patch %description This C library allows to transform XML files into other XML files @@ -129,6 +131,9 @@ rm -vrf %{buildroot}%{_docdir} %endif # with python2 %changelog +* Thu Jan 09 2020 David King - 1.1.32-4 +- Fix multilib issues with devel subpackage (#1765632) + * Mon Jun 25 2018 Charalampos Stratakis - 1.1.32-3 - Conditionalize the python2 subpackage