[cpp-opensaml] 19/19: Small adjustments to patch set.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-opensaml.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-opensaml.git;a=commit;h=cf7328914ebcfa33bfc392dac56bf4d8d7869a3e

commit cf7328914ebcfa33bfc392dac56bf4d8d7869a3e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 26 19:27:54 2018 -0400

    Small adjustments to patch set.
---
 .gitignore           | 4 ++++
 configure.ac         | 3 +--
 opensaml.spec.in     | 3 ++-
 samltest/Makefile.am | 3 +--
 samltest/internal.h  | 2 ++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc6be10..4831d59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,3 +75,7 @@ x64
 /samltest/*/*.cpp
 /samltest/**/*.cpp
 /samltest/**/*.xml.bck*
+/samltest/samltest.log
+/samltest/samltest.trs
+/samltest/test-suite.log
+
diff --git a/configure.ac b/configure.ac
index f1a4780..c3842ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,8 +93,7 @@ AX_PKG_CHECK_MODULES([log4shib],,[log4shib],
     [AX_PKG_CHECK_MODULES([log4cpp],,[log4cpp],
         [AC_DEFINE([OPENSAML_LOG4CPP],[1],[Define to 1 if log4cpp library is used.])])])
 
-# Xerces-C v2.6.0 has bugs that inhibit use with signed XML
-AX_PKG_CHECK_MODULES([xerces],,[xerces-c != 3.0])
+AX_PKG_CHECK_MODULES([xerces],,[xerces-c >= 3.2])
 
 AX_PKG_CHECK_MODULES([xmlsec],,[xml-security-c >= 2])
 
diff --git a/opensaml.spec.in b/opensaml.spec.in
index 6f8c2b4..8dc153a 100644
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -60,7 +60,7 @@ Group:		Development/Libraries/C and C++
 Requires:	libsaml10 = %{version}-%{release}
 Provides:	@PACKAGE_NAME at -devel = %{version}-%{release}
 Obsoletes:	@PACKAGE_NAME at -devel < %{version}-%{release}
-Requires:  libxerces-c-devel >= 3.2
+Requires: libxerces-c-devel >= 3.2
 Requires: libxml-security-c-devel >= 2.0.0
 Requires: libxmltooling-devel >= 3.0.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
@@ -117,6 +117,7 @@ This package includes XML schemas and related files.
 %files -n libsaml10
 %defattr(-,root,root,-)
 %{_libdir}/libsaml.so.*
+%exclude %{_libdir}/libsaml.la
 
 %files -n @PACKAGE_NAME at -schemas
 %defattr(-,root,root,-)
diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index 82a184f..1e4f460 100644
--- a/samltest/Makefile.am
+++ b/samltest/Makefile.am
@@ -4,8 +4,6 @@ TESTS = samltest
 
 check_PROGRAMS = samltest
 
-samltest_CXXFLAGS = $(CXXTESTFLAGS)
-
 samltest_h = \
     SAMLArtifactCreationTest.h \
     SAMLArtifactType0001Test.h \
@@ -114,6 +112,7 @@ $(samltest_h:.h=.cpp): %.cpp: %.h
 	$(CXXTEST) --have-eh --have-std --abort-on-fail --part -o $@ $<
 
 samltest_CXXFLAGS = \
+    $(CXXTESTFLAGS) \
     $(xerces_CFLAGS) \
     $(xmlsec_CFLAGS) \
     $(xmltooling_CFLAGS)
diff --git a/samltest/internal.h b/samltest/internal.h
index dfecba8..0bf606a 100644
--- a/samltest/internal.h
+++ b/samltest/internal.h
@@ -127,7 +127,9 @@ protected:
 
     void skipNetworked() {
         if (getenv("SAMLTEST_SKIP_NETWORKED")) {
+#ifdef TS_SKIP
             TS_SKIP("requires network access");
+#endif
         }
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.