-Name: @PACKAGE@
+Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
Release: 1
Summary: Open source system for attribute-based Web SSO
URL: http://shibboleth.internet2.edu/
Source: %{name}-sp-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root
+PreReq: openssl
%if 0%{?suse_version} > 1030
+PreReq: %{insserv_prereq}
BuildRequires: libXerces-c-devel >= 2.8.0
BuildRequires: libxml-security-c-devel >= 1.4.0
-BuildRequires: libxmltooling-devel >= 1.2
-BuildRequires: libsaml-devel >= 2.2
+BuildRequires: libxmltooling-devel >= 1.3
+BuildRequires: libsaml-devel >= 2.3
%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: liblog4shib-devel}
%else
BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0
BuildRequires: xml-security-c-devel >= 1.4.0
-BuildRequires: xmltooling-devel >= 1.2
-BuildRequires: opensaml-devel >= 2.2
+BuildRequires: xmltooling-devel >= 1.3
+BuildRequires: opensaml-devel >= 2.3
%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: log4shib-devel}
%endif
-BuildRequires: gcc-c++
+BuildRequires: gcc-c++, pkgconfig, zlib-devel
%{!?_without_doxygen:BuildRequires: doxygen}
-BuildRequires: zlib-devel
+%{!?_without_odbc:BuildRequires:unixODBC-devel}
%{?_with_fastcgi:BuildRequires: fcgi-devel}
%if "%{_vendor}" == "redhat"
%{!?_without_builtinapache:BuildRequires: httpd-devel}
+BuildRequires: redhat-rpm-config
%endif
%if "%{_vendor}" == "suse"
%{!?_without_builtinapache:BuildRequires: apache2-devel}
%if 0%{?suse_version} > 1030
Requires: libXerces-c-devel >= 2.8.0
Requires: libxml-security-c-devel >= 1.4.0
-Requires: libxmltooling-devel >= 1.2
-Requires: libsaml-devel >= 2.2
+Requires: libxmltooling-devel >= 1.3
+Requires: libsaml-devel >= 2.3
%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
%{!?_with_log4cpp:Requires: liblog4shib-devel}
%else
Requires: xerces%{?xercesver}-c-devel >= 2.8.0
Requires: xml-security-c-devel >= 1.4.0
-Requires: xmltooling-devel >= 1.2
-Requires: opensaml-devel >= 2.2
+Requires: xmltooling-devel >= 1.3
+Requires: opensaml-devel >= 2.3
%{?_with_log4cpp:Requires: log4cpp-devel >= 1.0}
%{!?_with_log4cpp:Requires: log4shib-devel}
%endif
%build
%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{?_with_memcached} %{?shib_options}
-%{__make}
+%{__make} pkgdocdir=%{pkgdocdir}
%install
%{__make} install NOKEYGEN=1 DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
fi
fi
-%if "%{_vendor}" == "redhat"
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "suse"
# %{_initddir} not yet in RHEL5, use deprecated %{_initrddir}
- mkdir -p $RPM_BUILD_ROOT%{_initrddir}
- %{__cp} -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
- %{__chmod} 755 $RPM_BUILD_ROOT%{_initrddir}/shibd
+ install -d -m 0755 $RPM_BUILD_ROOT%{_initrddir}
+ install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
+%if "%{_vendor}" == "suse"
+ install -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir}
+ %{__ln_s} -f %{_initrddir}/shibd $RPM_BUILD_ROOT%{_sbindir}/rcshibd
+%endif
%endif
%check
if [ "$1" -gt "1" ] ; then
/etc/init.d/shibd status 1>/dev/null && /etc/init.d/shibd restart 1>/dev/null
%{!?_without_builtinapache:/etc/init.d/httpd status 1>/dev/null && /etc/init.d/httpd restart 1>/dev/null}
+ exit 0
fi
%endif
-
%if "%{_vendor}" == "suse"
- # On upgrade, restart components if they're already running.
- if [ "$1" -gt "1" ] ; then
- %{!?_without_builtinapache:/etc/init.d/apache2 status 1>/dev/null && /etc/init.d/apache2 restart 1>/dev/null}
- fi
+ # This adds the proper /etc/rc*.d links for the script
+ cd /
+ %insserv_force_if_yast shibd
%endif
%preun
if [ "$1" = 0 ] ; then
/sbin/service shibd stop >/dev/null 2>&1
/sbin/chkconfig --del shibd
+ %{!?_without_builtinapache:/etc/init.d/httpd status 1>/dev/null && /etc/init.d/httpd restart 1>/dev/null}
fi
%endif
+%if "%{_vendor}" == "suse"
+ %stop_on_removal shibd
+ if [ "$1" = 0 ] ; then
+ %{!?_without_builtinapache:/etc/init.d/apache2 status 1>/dev/null && /etc/init.d/apache2 restart 1>/dev/null}
+ fi
+%endif
+exit 0
+%postun
%ifnos solaris2.8 solaris2.9 solaris2.10
-%postun -p /sbin/ldconfig
+/sbin/ldconfig
+%endif
+%if "%{_vendor}" == "suse"
+cd /
+%restart_on_update shibd
+%{!?_without_builtinapache:%restart_on_update apache2}
+%{insserv_cleanup}
%endif
%posttrans
%exclude %{_libdir}/%{name}/*.la
%dir %{_localstatedir}/log/%{name}
%dir %{_localstatedir}/run/%{name}
-%dir %{_datadir}/xml/%{name}
-%{_datadir}/xml/%{name}/*
+%dir %{_datadir}/xml/%{name}-%{version}
+%{_datadir}/xml/%{name}-%{version}/*
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*.xml
%config(noreplace) %{_sysconfdir}/%{name}/*.html
%config(noreplace) %{_sysconfdir}/%{name}/*.logger
-%if "%{_vendor}" == "redhat"
-%attr(755, root, root) %{_initrddir}/shibd
+%if "%{_vendor}" == "redhat" || "%{_vendor}" == "suse"
+%config %{_initrddir}/shibd
+%endif
+%if "%{_vendor}" == "suse"
+%{_sbindir}/rcshibd
%endif
%{_sysconfdir}/%{name}/*.dist
%{_sysconfdir}/%{name}/apache*.config
%doc %{pkgdocdir}/api
%changelog
-* Sat Aug 8 2009 Scott Cantor <cantor.2@osu.edu> - 2.2.1-1
+* Fri Dec 25 2009 Scott Cantor <cantor.2@osu.edu> - 2.4-1
+- Bump version and version schema folder.
+
+* Mon Nov 23 2009 Scott Cantor <cantor.2@osu.edu> - 2.3.1-1
+- Reset revision for 2.3.1 release
+
+* Wed Aug 19 2009 Scott Cantor <cantor.2@osu.edu> - 2.2.1-2
+- SuSE init script changes
+- Restart Apache on removal, not just upgrade
+- Fix scriptlet exit values when Apache is stopped
+
+* Mon Aug 10 2009 Scott Cantor <cantor.2@osu.edu> - 2.2.1-1
- Doc handling changes
+- SuSE init script
* Tue Aug 4 2009 Scott Cantor <cantor.2@osu.edu> - 2.2.1-1
- Initial version for 2.2.1, with shibd/httpd restart on upgrade
projects / shibboleth / cpp-sp.git / blobdiff