Support using system xerces and xml-security on Redhat

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 19feb85..424df28 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -1,6 +1,6 @@
 Name:          @PACKAGE_NAME@
 Version:       @PACKAGE_VERSION@
-Release:       1
+Release:       2
 Summary:       OpenSAML XMLTooling library
 Group:         Development/Libraries/C and C++
 Vendor:                Shibboleth Consortium
@@ -10,18 +10,18 @@ Source:             %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 BuildRequires:  libXerces-c-devel >= 2.8.0
-%else
-BuildRequires:  libxerces-c-devel >= 2.8.0
 %endif
-BuildRequires:  libxml-security-c-devel >= 1.4.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 BuildRequires: gcc-c++, openssl-devel, boost-devel >= 1.32.0
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 BuildRequires: libcurl-openssl-devel >= 7.21.7
+BuildRequires: xerces-c-devel >= 2.8.0, xml-security-c-devel >= 1.6.0
 Requires: libcurl-openssl >= 7.21.7
 %else
 BuildRequires: curl-devel >= 7.10.6
+BuildRequires:  libxerces-c-devel >= 2.8.0
+BuildRequires:  libxml-security-c-devel >= 1.4.0
 %endif
 %if 0%{?suse_version} > 1000
 BuildRequires: pkg-config
@@ -76,17 +76,16 @@ Provides:   @PACKAGE_NAME@-devel = %{version}-%{release}
 Obsoletes:     @PACKAGE_NAME@-devel < %{version}-%{release}
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 Requires:  libXerces-c-devel >= 2.8.0
-%else
-Requires:  libxerces-c-devel >= 2.8.0
 %endif
-Requires: libxml-security-c-devel >= 1.4.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 Requires: openssl-devel, boost-devel >= 1.32.0
 %if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600
 Requires: libcurl-openssl-devel >= 7.21.7
+Requires: xerces-c-devel >= 2.8.0, xml-security-c-devel >= 1.6.0
 %else
 Requires: curl-devel >= 7.10.6
+Requires: libxml-security-c-devel >= 1.4.0, libxerces-c-devel >= 2.8.0
 %endif
 
 %description -n lib@PACKAGE_NAME@-devel