[cpp-sp] branch master updated: Fix config file tests, update log4shib requirement.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  a29da45   Fix config file tests, update log4shib requirement.
a29da45 is described below

commit a29da453f237057f3713a79e31985b446f816cca
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Apr 30 16:31:50 2018 -0400

    Fix config file tests, update log4shib requirement.
---
 shibboleth.spec.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 4b8eca0..1aea2c3 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -26,7 +26,7 @@ BuildRequires:	libxml-security-c-devel >= 2.0.0
 BuildRequires:	libxmltooling-devel >= 3.0.0
 BuildRequires:	libsaml-devel >= 3.0.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
-%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
+%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.10}
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
 Requires:	libcurl-openssl%{?_isa} >= 7.21.7
 BuildRequires:	chrpath
@@ -90,7 +90,7 @@ Requires: 	libxml-security-c-devel >= 2.0.0
 Requires: 	libxmltooling-devel >= 3.0.0
 Requires: 	libsaml-devel >= 3.0.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
-%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
+%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.10}
 
 %description devel
 Shibboleth is a Web Single Sign-On implementations based on OpenSAML
@@ -288,8 +288,8 @@ fi
 %{__chown} %{runuser}:%{runuser} %{_localstatedir}/log/shibboleth/* 2>/dev/null || :
 
 # Install config file if no existing files are found.
-if [ -f %{_sysconfdir}/shibboleth/shibboleth3.xml ] ; then
-	if [ -f %{_sysconfdir}/shibboleth/shibboleth2.xml ] ; then
+if [ ! -f %{_sysconfdir}/shibboleth/shibboleth3.xml ] ; then
+	if [ ! -f %{_sysconfdir}/shibboleth/shibboleth2.xml ] ; then
 		install $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibboleth3.xml %{_sysconfdir}/shibboleth/
 	fi
 fi

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