Handle conditional test inclusion.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-opensaml2/trunk@340 fb386ef7-a10c-0410-8ebf-fd3f8e989ab0

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 449d2f9..a9dadca 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -1,14 +1,15 @@
 Name:          opensaml
 Summary:       Open source SAML 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.8.0, xml-security-c-devel >= 1.4.0
+BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0
+BuildRequires:  xml-security-c-devel >= 1.4.0
 BuildRequires: xmltooling-devel
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
@@ -51,6 +52,8 @@ OpenSAML Library API documentation generated by doxygen.
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT/%{_bindir} -type f |
+  %{__sed} -e "s|$RPM_BUILD_ROOT||" | sort > rpm.binlist
 
 %check || :
 %{__make} check
@@ -66,13 +69,11 @@ OpenSAML Library API documentation generated by doxygen.
 %postun -p /sbin/ldconfig
 %endif
 
-%files
+%files -f rpm.binlist
 %defattr(-,root,root,-)
-%{_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
@@ -88,6 +89,9 @@ OpenSAML Library API documentation generated by doxygen.
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog
+* Thu Nov 08 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-4
+- Second public beta.
+
 * Thu Aug 16 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-3
 - First public beta.