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/xmltooling.spec.in b/xmltooling.spec.in
index 0246862..a7f169a 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -12,6 +12,11 @@ BuildRoot:   %{_tmppath}/%{name}-%{version}-root
 BuildRequires: xerces%{?xercesver}-c-devel >= 2.6.1
 BuildRequires: xml-security-c-devel >= 1.3.1
 BuildRequires: openssl-devel log4cpp-devel >= 0.3.5, cxxtest
 BuildRequires: xerces%{?xercesver}-c-devel >= 2.6.1
 BuildRequires: xml-security-c-devel >= 1.3.1
 BuildRequires: openssl-devel log4cpp-devel >= 0.3.5, cxxtest

+%if %{?_with_log4cpp:1}
+BuildRequires: log4cpp-devel >= 0.3.5
+%else
+BuildRequires: log4shib-devel
+%endif

 
 %description
 The XMLTooling library contains generic XML parsing and processing
 
 %description
 The XMLTooling library contains generic XML parsing and processing