X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling.spec.in;h=567e86b8e7d81ab234b6d7a2005e0c8d4a3d6564;hb=a897d49570b9b2d3ed9d4448c0f170e21030352a;hp=f9384e38cd086d48e02d508f17427929f80f5520;hpb=7873a270569765589d4ed2fb76499eea56ace8e8;p=shibboleth%2Fxmltooling.git

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index f9384e3..567e86b 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -1,17 +1,17 @@
 Name:		xmltooling
 Summary:	Open source XMLTooling library
 Version:	@-VERSION-@
-Release:	3
+Release:	4
 Group:		System Environment/Libraries
 Vendor:		Internet2
 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:  xerces%{?xercesver}-c-devel >= 2.8.0
 BuildRequires:	xml-security-c-devel >= 1.4.0
-BuildRequires:	openssl-devel, cxxtest
-%{?_with_log4cpp:BuildRequires:	log4cpp-devel >= 0.3.5}
+BuildRequires:	openssl-devel
+%{?_with_log4cpp:BuildRequires:	log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
 %description
@@ -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,9 +93,12 @@ XMLTooling Library API documentation generated by doxygen.
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api
+%doc %{_datadir}/doc/xmltooling/api
 
 %changelog
+* Thu Nov 08 2007  Scott Cantor  <cantor.2@osu.edu>  - 1.0-4
+- Second public beta.
+
 * Thu Aug 16 2007  Scott Cantor  <cantor.2@osu.edu>  - 1.0-3
 - First public beta.