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.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2410 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index e510906..27dce5a 100644 (file)
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -9,9 +9,15 @@ URL:           http://shibboleth.internet2.edu/
 Source0:       http://shibboleth.internet2.edu/downloads/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires: openssl-devel, curl-devel >= 7.10.6, xerces%{?xercesver}-c-devel >= 2.6.1
-BuildRequires: xml-security-c-devel >= 1.3.1, log4cpp-devel >= 0.3.5
+BuildRequires: openssl-devel, curl-devel >= 7.10.6
+BuildRequires: xerces%{?xercesver}-c-devel >= 2.6.1, xml-security-c-devel >= 1.3.1
 BuildRequires: zlib-devel, unixODBC-devel, opensaml-devel >= 2.0
+%if %{?_with_log4cpp:1}
+BuildRequires: log4cpp-devel >= 0.3.5
+%else
+BuildRequires: log4shib-devel
+%endif
+%{!?_without_odbc:BuildRequires: unixODBC-devel}
 %if "%{_vendor}" == "redhat"
 BuildRequires: httpd-devel
 %endif