Multi-line svn commit, see body.

Sync up older 1.3 spec file and require opensaml < 2.0
Add --with-odbc option to 2.0 rebuild.
Add conditional logging dependency using --with-log4cpp.

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 8db2ad8..aae6636 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -11,8 +11,12 @@ BuildRoot:   %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: xerces%{?xercesver}-c-devel >= 2.6.1
 BuildRequires: xml-security-c-devel >= 1.3.1
-BuildRequires: log4cpp-devel >= 0.3.5
 BuildRequires: xmltooling-devel, cxxtest
+%if %{?_with_log4cpp:1}
+BuildRequires: log4cpp-devel >= 0.3.5
+%else
+BuildRequires: log4shib-devel
+%endif
 
 %description
 OpenSAML is an open source implementation of the OASIS Security Assertion