Convert role lookups to find_if algorithm.

[shibboleth/opensaml2.git] / opensaml.spec.in

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 8474894..449d2f9 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -8,10 +8,9 @@ License:       Apache 2.0
 URL:           http://www.opensaml.org/
 Source0:       %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0
-BuildRequires: xml-security-c-devel >= 1.4.0
-BuildRequires: xmltooling-devel, cxxtest
-%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 0.3.5}
+BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0, xml-security-c-devel >= 1.4.0
+BuildRequires: xmltooling-devel
+%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
 %description
@@ -51,9 +50,7 @@ OpenSAML Library API documentation generated by doxygen.
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%{__rm} -rf _docs
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT/usr/doc/%{name} _docs
 
 %check || :
 %{__make} check
@@ -71,12 +68,15 @@ OpenSAML Library API documentation generated by doxygen.
 
 %files
 %defattr(-,root,root,-)
-%doc _docs/LICENSE.txt _docs/NOTICE.txt
 %{_bindir}/samlsign
 %{_libdir}/libsaml.so.*
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}
 %exclude %{_bindir}/samltest
+%docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}/LICENSE.txt
+%{_datadir}/doc/%{name}/NOTICE.txt
+%{_datadir}/doc/%{name}/LOG4CPP.LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,7 +85,7 @@ OpenSAML Library API documentation generated by doxygen.
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api
+%doc %{_datadir}/doc/%{name}/api
 
 %changelog
 * Thu Aug 16 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-3