Bump build requirements and error messages.

[shibboleth/cpp-sp.git] / shibboleth.spec.in

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index 5b37ddc..9eb22ee 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -1,14 +1,15 @@
 Name:          @PACKAGE_NAME@
 Version:       @PACKAGE_VERSION@
 Release:       1
-Summary:    Open source system for attribute-based Web SSO
+Summary:       Open source system for attribute-based Web SSO
 Group:         Productivity/Networking/Security
-Vendor:     Internet2
+Vendor:                Internet2
 License:       Apache 2.0
 URL:           http://shibboleth.internet2.edu/
-Source:     %{name}-sp-%{version}.tar.gz
+Source:                %{name}-sp-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-Requires:   openssl, xmltooling-schemas, opensaml-schemas
+Requires:      openssl
+PreReq:                xmltooling-schemas, opensaml-schemas
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 PreReq:         %{insserv_prereq}
 BuildRequires:  libXerces-c-devel >= 2.8.0
@@ -16,11 +17,11 @@ BuildRequires:  libXerces-c-devel >= 2.8.0
 BuildRequires:  libxerces-c-devel >= 2.8.0
 %endif
 BuildRequires:  libxml-security-c-devel >= 1.4.0
-BuildRequires:  libxmltooling-devel >= 1.4
-BuildRequires:  libsaml-devel >= 2.4
+BuildRequires:  libxmltooling-devel >= 1.5
+BuildRequires:  libsaml-devel >= 2.5
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 Requires: libcurl-openssl >= 7.21.7
 BuildRequires: chrpath
 %endif
@@ -60,8 +61,8 @@ Requires:     libXerces-c-devel >= 2.8.0
 Requires:      libxerces-c-devel >= 2.8.0
 %endif
 Requires:      libxml-security-c-devel >= 1.4.0
-Requires:      libxmltooling-devel >= 1.4
-Requires:      libsaml-devel >= 2.4
+Requires:      libxmltooling-devel >= 1.5
+Requires:      libsaml-devel >= 2.5
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel}
 
@@ -86,7 +87,7 @@ This package includes files needed for development with Shibboleth.
        %{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
                $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/native.logger
 %endif
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
        %{__sed} -i "s/#_RHEL6_//g" \
                $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-redhat
        %{__sed} -i "s/\/opt\/shibboleth\/lib/\/opt\/shibboleth\/%{_lib}/g" \
@@ -120,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
 
@@ -214,10 +215,12 @@ cd /
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*
 %exclude %{_libdir}/%{name}/*.la
-%attr(0750,-,-) %dir %{_localstatedir}/log/%{name}
+%attr(0750,root,root) %dir %{_localstatedir}/log/%{name}
 %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
@@ -231,8 +234,8 @@ cd /
 %{_sysconfdir}/%{name}/*.dist
 %{_sysconfdir}/%{name}/apache*.config
 %{_sysconfdir}/%{name}/shibd-*
-%attr(755,-,-) %{_sysconfdir}/%{name}/keygen.sh
-%attr(755,-,-) %{_sysconfdir}/%{name}/metagen.sh
+%attr(0755,root,root) %{_sysconfdir}/%{name}/keygen.sh
+%attr(0755,root,root) %{_sysconfdir}/%{name}/metagen.sh
 %{_sysconfdir}/%{name}/*.xsl
 %doc %{pkgdocdir}
 %exclude %{pkgdocdir}/api