X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=opensaml.spec.in;h=449d2f969dfaf6f3d1cf08036a25a7fe18ae488a;hb=6a9bf824cf4bdef8e2a95d8bfb41a31172a713da;hp=1dd93120593804cd09d6e6089b226cd2472e0ecf;hpb=b25f6f272b23747f04631e31fdce5066705ca568;p=shibboleth%2Fopensaml2.git

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 1dd9312..449d2f9 100644
--- 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.6.1
-BuildRequires:	xml-security-c-devel >= 1.3.1
-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
@@ -47,34 +46,37 @@ OpenSAML Library API documentation generated by doxygen.
 
 %build
 %configure %{?saml_options}
-make
+%{__make}
 
 %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
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %check || :
-make check
+%{__make} check
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%ifnos solaris2.8 solaris2.9 solaris2.10 
+%post -p /sbin/ldconfig
+%endif
 
-%postun
-/sbin/ldconfig
+%ifnos solaris2.8 solaris2.9 solaris2.10 
+%postun -p /sbin/ldconfig
+%endif
 
 %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,-)
@@ -83,7 +85,7 @@ make check
 
 %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