[cpp-sp] branch master updated: Exclude new config (again) and install from .dist

[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=41c1d105674ffb582e993fef0496f7743ce923c7

The following commit(s) were added to refs/heads/master by this push:
       new  41c1d10   Exclude new config (again) and install from .dist
41c1d10 is described below

commit 41c1d105674ffb582e993fef0496f7743ce923c7
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 3 15:41:57 2018 -0400

    Exclude new config (again) and install from .dist
---
 shibboleth.spec.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index aca48ba..ba6b0b6 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -285,9 +285,10 @@ fi
 %{__chown} %{runuser}:%{runuser} %{_localstatedir}/log/shibboleth/* 2>/dev/null || :
 
 # Install config file and generate new keys if no existing config is found.
+# Note we have to copy from the .dist version because of RPM exclusion below.
 if [ ! -f %{_sysconfdir}/shibboleth/shibboleth3.xml ] ; then
 	if [ ! -f %{_sysconfdir}/shibboleth/shibboleth2.xml ] ; then
-		install $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibboleth3.xml %{_sysconfdir}/shibboleth/
+		install $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibboleth3.xml.dist %{_sysconfdir}/shibboleth/shibboleth3.xml
 		cd %{_sysconfdir}/shibboleth
 		/bin/sh ./keygen.sh -b -n sp-signing -u %{runuser} -g %{runuser}
 		/bin/sh ./keygen.sh -b -n sp-encrypt -u %{runuser} -g %{runuser}
@@ -451,6 +452,7 @@ exit 0
 %{_sysconfdir}/shibboleth/*.dist
 %{_sysconfdir}/shibboleth/apache*.config
 %{_sysconfdir}/shibboleth/shibd-*
+%exclude %{_sysconfdir}/shibboleth/shibboleth3.xml
 %attr(0755,root,root) %{_sysconfdir}/shibboleth/keygen.sh
 %attr(0755,root,root) %{_sysconfdir}/shibboleth/metagen.sh
 %attr(0755,root,root) %{_sysconfdir}/shibboleth/seckeygen.sh

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