Fix documentation directory and eliminate special handling in spec file.

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

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index f9384e3..481b7e2 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -55,9 +55,7 @@ XMLTooling 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/xmltooling _docs
 
 %check || :
 %{__make} check
@@ -75,12 +73,17 @@ XMLTooling Library API documentation generated by doxygen.
 
 %files
 %defattr(-,root,root,-)
-%doc _docs/LICENSE.txt _docs/NOTICE.txt
 %{_libdir}/libxmltooling.so.*
 %{_libdir}/libxmltooling-lite.so.*
 %dir %{_datadir}/xml/xmltooling
 %{_datadir}/xml/xmltooling
 %exclude %{_bindir}/xmltoolingtest
+%docdir %{_datadir}/doc/xmltooling
+%{_datadir}/doc/xmltooling/LICENSE.txt
+%{_datadir}/doc/xmltooling/NOTICE.txt
+%{_datadir}/doc/xmltooling/CURL.LICENSE
+%{_datadir}/doc/xmltooling/LOG4CPP.LICENSE
+%{_datadir}/doc/xmltooling/OPENSSL.LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -90,7 +93,7 @@ XMLTooling Library API documentation generated by doxygen.
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api
+%doc %{_datadir}/doc/xmltooling/api
 
 %changelog
 * Thu Aug 16 2007  Scott Cantor  <cantor.2@osu.edu>  - 1.0-3