Merge branch 'f33' into epel7

xalan-c.spec

@@ -1,6 +1,6 @@
 Name:           xalan-c
 Version:        1.11.0
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Xalan XSLT processor for C/C++
 
 License:        ASL 2.0
@@ -18,6 +18,8 @@ BuildRequires:  gcc-c++
 BuildRequires:  xerces-c-devel
 
 %global so_version %(echo %{version} | cut -d . -f -2 | tr -d .)
+# For EPEL
+%global _hardened_build 1
 
 %description
 The Apache Xalan-C++ Project provides a library and a command line program to
@@ -66,7 +68,9 @@ COMMONARGS="-plinux -cgcc -xg++ -minmem"
 %global _smp_mflags %{nil}
 %make_build all tests
 pushd xdocs
-./make-apiDocs.sh
+env LD_LIBRARY_PATH="${XALANCROOT}/lib" \
+    PATH="${PATH}:${XALANCROOT}/bin" \
+    ./make-apiDocs.sh
 popd
 mv -v build/docs/xalan-c build/docs/html
 
@@ -82,9 +86,8 @@ export XERCESROOT=%{_includedir}/xercesc/
 
 
 %check
-LD_LIBRARY_PATH=$PWD/lib; export LD_LIBRARY_PATH
-./bin/testXPath
-# ./bin/ThreadTest crashes; how inauspicious!
+env LD_LIBRARY_PATH=$PWD/lib ./bin/testXPath
+# env LD_LIBRARY_PATH=$PWD/lib ./bin/ThreadTest crashes; how inauspicious!
 
 
 %files
@@ -113,6 +116,10 @@ LD_LIBRARY_PATH=$PWD/lib; export LD_LIBRARY_PATH
 
 
 %changelog
+* Thu Dec 10 2020 Benjamin A. Beasley <code@musicinmybrain.net> - 1.11.0-21
+- Fixes for API documentation build
+- Ensure we compile with additional hardening flags even on EPEL
+
 * Wed Dec  9 2020 Benjamin A. Beasley <code@musicinmybrain.net> - 1.11.0-20
 - Build API documentation with Doxygen
 - Update summaries and descriptions from upstream