Bump version to 2.6.0 and adjust soname and DLL name.

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

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index bb0491b..fef3ece 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -11,9 +11,9 @@ BuildRoot:    %{_tmppath}/%{name}-sp-%{version}-root
 Obsoletes:     shibboleth-sp = 2.5.0
 Requires:      openssl
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
-PreReq:                xmltooling-schemas%{?_isa} >= 1.5.5, opensaml-schemas%{?_isa} >= 2.5.5
+PreReq:                xmltooling-schemas%{?_isa} >= 1.5.5, opensaml-schemas%{?_isa} >= 2.6.0
 %else
-PreReq:                xmltooling-schemas >= 1.5.5, opensaml-schemas >= 2.5.5
+PreReq:                xmltooling-schemas >= 1.5.5, opensaml-schemas >= 2.6.0
 %endif
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 PreReq:                %{insserv_prereq} %{fillup_prereq}
@@ -28,7 +28,7 @@ BuildRequires:        libxerces-c-devel >= 3.1
 %endif
 BuildRequires: libxml-security-c-devel >= 1.7.3
 BuildRequires: libxmltooling-devel >= 1.5.5
-BuildRequires: libsaml-devel >= 2.5.5
+BuildRequires: libsaml-devel >= 2.6.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
@@ -67,6 +67,8 @@ BuildRequires: systemd-rpm-macros, systemd-devel, pkgconfig
 %endif
 %endif
 
+%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
+
 %define runuser shibd
 %if "%{_vendor}" == "suse"
 %define pkgdocdir %{_docdir}/shibboleth
@@ -94,7 +96,7 @@ Requires:     libxerces-c-devel >= 3.1
 %endif
 Requires:      libxml-security-c-devel >= 1.7.3
 Requires:      libxmltooling-devel >= 1.5.5
-Requires:      libsaml-devel >= 2.5.5
+Requires:      libsaml-devel >= 2.6.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 
@@ -169,6 +171,13 @@ SYSTEMD_SHIBD="no"
        %{__mkdir} -p $RPM_BUILD_ROOT%{_unitdir}
        echo "%attr(0444,-,-) %{_unitdir}/shibd.service" >> rpm.filelist
        SYSTEMD_SHIBD="$RPM_BUILD_ROOT%{_unitdir}/shibd.service"
+
+       # Get run directory created at boot time.
+       %{__mkdir} -p $RPM_BUILD_ROOT%{_tmpfilesdir}
+       echo "%attr(0444,-,-) %{_tmpfilesdir}/%{name}.conf" >> rpm.filelist
+       cat > $RPM_BUILD_ROOT%{_tmpfilesdir}/%{name}.conf <<EOF
+d /run/%{name} 755 %{runuser} %{runuser} -
+EOF
 %endif
 
 # Otherwise, establish location of sysconfig file, if any.
@@ -320,6 +329,7 @@ fi
 %if "%{_vendor}" == "suse"
 %if 0%{?suse_version} >= 1210
        %service_add_post shibd.service
+       systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
 %else
        # This adds the proper /etc/rc*.d links for the script
        # and populates the sysconfig/shibd file.
@@ -441,6 +451,9 @@ exit 0
 %config %{_initrddir}/shibd
 %{_sbindir}/rcshibd
 %endif
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+%{_tmpfilesdir}/%{name}.conf
+%endif
 %{_sysconfdir}/shibboleth/*.dist
 %{_sysconfdir}/shibboleth/apache*.config
 %{_sysconfdir}/shibboleth/shibd-*
@@ -458,6 +471,12 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %changelog
+* Tue May 03 2016 Scott Cantor <cantor.2@osu.edu> - 2.6.0-1
+- Bump opensaml dependency version
+
+* Thu Jul 23 2015 Scott Cantor <cantor.2@osu.edu> - 2.5.5-2
+- Fix use of /var/run/shibboleth on newer tmpfs platforms
+
 * Thu Jul 2 2015 Scott Cantor <cantor.2@osu.edu> - 2.5.5-1
 - Revamp with systemd support for RH/CentOS 7+ and SUSE 12.1+