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

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index f9384e3..8cac0f4 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:	6
 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, curl-devel >= 7.10.6
+%{?_with_log4cpp:BuildRequires:	log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
 %description
@@ -55,9 +55,9 @@ 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
+find $RPM_BUILD_ROOT/%{_bindir} -type f |
+  %{__sed} -e "s|$RPM_BUILD_ROOT||" | sort > rpm.binlist
 
 %check || :
 %{__make} check
@@ -73,14 +73,18 @@ XMLTooling Library API documentation generated by doxygen.
 %postun -p /sbin/ldconfig
 %endif
 
-%files
+%files -f rpm.binlist
 %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 +94,18 @@ XMLTooling Library API documentation generated by doxygen.
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api
+%doc %{_datadir}/doc/xmltooling/api
 
 %changelog
+* Mon Mar 17 2008  Scott Cantor  <cantor.2@osu.edu>  - 1.0-6
+- Official release.
+
+* Fri Jan 18 2008  Scott Cantor  <cantor.2@osu.edu>  - 1.0-5
+- Release candidate 1.
+
+* 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.