https://issues.shibboleth.net/jira/browse/SSPCPP-345

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 3b3f8de..5224c4e 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -4,9 +4,9 @@ AUTOMAKE_OPTIONS = foreign
 
 pkglibdir = ${libdir}/@PACKAGE@
 pkglogdir = ${localstatedir}/log/@PACKAGE@
-pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
 shirelogdir = ${localstatedir}/log/httpd
 pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgwebdir = $(datadir)/@PACKAGE@
 pkgrundir = $(localstatedir)/run/@PACKAGE@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
@@ -46,7 +46,7 @@ CONFIGFILES = \
        metadataError.html \
        bindingTemplate.html \
        discoveryTemplate.html \
-    postTemplate.html \
+       postTemplate.html \
        localLogout.html \
        globalLogout.html \
        partialLogout.html \
@@ -61,8 +61,8 @@ do-build-file:
         -e 's:@-PREFIX-@:${prefix}:g' \
         -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
         -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-        -e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
         -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+        -e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \
         -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
         -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
         -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
@@ -100,7 +100,6 @@ all-data-local: $(BUILTCONFIGFILES)
 
 install-data-local:    all-data-local
        $(mkinstalldirs) $(DESTDIR)$(pkglogdir)
-       $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
        $(mkinstalldirs) $(DESTDIR)$(shirelogdir)
        $(mkinstalldirs) $(DESTDIR)$(pkgrundir)
        $(mkinstalldirs) $(DESTDIR)$(pkgxmldir)

diff --git a/configs/apache.config.in b/configs/apache.config.in
index 4eaa51f..0ad7307 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -1,4 +1,4 @@
-# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
 
 # RPM installations on platforms with a conf.d directory will
 # result in this file being copied into that directory for you
@@ -32,8 +32,8 @@ SetHandler shib-handler
 # Used for example logo and style sheet in error templates.
 #
 <IfModule mod_alias.c>
-  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
-  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index ec3df49..565a135 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -1,4 +1,4 @@
-# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
 
 # RPM installations on platforms with a conf.d directory will
 # result in this file being copied into that directory for you
@@ -19,8 +19,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_20.so
   <Location /shibboleth-sp>
     Allow from all
   </Location>
-  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
-  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #

diff --git a/configs/apache22.config.in b/configs/apache22.config.in
index 853dd42..149409d 100644 (file)
--- a/configs/apache22.config.in
+++ b/configs/apache22.config.in
@@ -1,4 +1,4 @@
-# https://spaces.internet2.edu/display/SHIB2/NativeSPApacheConfig
+# https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPApacheConfig
 
 # RPM installations on platforms with a conf.d directory will
 # result in this file being copied into that directory for you
@@ -19,8 +19,8 @@ LoadModule mod_shib @-PKGLIBDIR-@/mod_shib_22.so
   <Location /shibboleth-sp>
     Allow from all
   </Location>
-  Alias /shibboleth-sp/main.css @-PKGDOCDIR-@/main.css
-  Alias /shibboleth-sp/logo.jpg @-PKGDOCDIR-@/logo.jpg
+  Alias /shibboleth-sp/main.css @-PKGWEBDIR-@/main.css
+  Alias /shibboleth-sp/logo.jpg @-PKGWEBDIR-@/logo.jpg
 </IfModule>
 
 #

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3a0692b..0c3c93b 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
+pkgwebdir = $(datadir)/@PACKAGE@
 
 install-data-hook:
        if test -d api ; then \
@@ -16,10 +17,12 @@ docfiles = \
        RELEASE.txt \
        FASTCGI.LICENSE \
        OPENSSL.LICENSE \
-       LOG4CPP.LICENSE \
-       main.css \
-       logo.jpg
-       
+       LOG4CPP.LICENSE
+
+webfiles = main.css logo.jpg
+
 pkgdoc_DATA = $(docfiles)
 
-EXTRA_DIST = $(docfiles) api
+pkgweb_DATA = $(webfiles)
+
+EXTRA_DIST = $(docfiles) $(webfiles) api

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 752e86f..7aaa846 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -121,7 +121,7 @@ if [ "$APACHE_CONFIG" != "no" ] ; then
     if [ "$APACHE_CONFD" != "no" ] ; then
         %{__mkdir} -p $RPM_BUILD_ROOT$APACHE_CONFD
         %{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$APACHE_CONFIG $RPM_BUILD_ROOT$APACHE_CONFD/shib.conf 
-        echo "%config $APACHE_CONFD/shib.conf" > rpm.filelist
+        echo "%config(noreplace) $APACHE_CONFD/shib.conf" > rpm.filelist
     fi
 fi
 
@@ -219,6 +219,8 @@ cd /
 %dir %{_localstatedir}/run/%{name}
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}/*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*.xml
 %config(noreplace) %{_sysconfdir}/%{name}/*.html