From: Scott Cantor <cantor.2@osu.edu>
Date: Wed, 27 Aug 2014 15:34:12 +0000 (+0000)
Subject: Update specfile for RH7
X-Git-Tag: 1.0.0~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp-resolver.git;a=commitdiff_plain;h=b691670dce606f9a4f4b3a9280e8a0368a92e66d

Update specfile for RH7
---

diff --git a/resolver.spec.in b/resolver.spec.in
index 1b5f1d3..e9e0170 100644
--- a/resolver.spec.in
+++ b/resolver.spec.in
@@ -8,11 +8,15 @@ License:	Apache 2.0
 URL:		http://shibboleth.net/
 Source0:	http://shibboleth.net/downloads/extensions/sp/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-%if 0%{?suse_version} > 1030
+%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 BuildRequires:  libXerces-c-devel >= 2.8.0
 %else
+%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+BuildRequires:  xerces-c-devel >= 2.8.0
+%else
 BuildRequires:  libxerces-c-devel >= 2.8.0
 %endif
+%endif
 BuildRequires:  libxml-security-c-devel >= 1.4.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
@@ -51,10 +55,14 @@ Group:      Development/Libraries
 Requires:   libshibresolver1 = %{version}-%{release}
 Provides:   @PACKAGE_NAME@-devel = %{version}-%{release}
 Obsoletes:  @PACKAGE_NAME@-devel < %{version}-%{release}
-%if 0%{?suse_version} > 1030
-BuildRequires:  libXerces-c-devel >= 2.8.0
+%if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
+Requires: libXerces-c-devel >= 2.8.0
 %else
-BuildRequires:  libxerces-c-devel >= 2.8.0
+%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+Requires: xerces-c-devel >= 2.8.0
+%else
+Requires: libxerces-c-devel >= 2.8.0
+%endif
 %endif
 Requires: libxml-security-c-devel >= 1.4.0
 Requires: libxmltooling-devel, libsaml-devel, shibboleth-sp-devel
@@ -104,5 +112,8 @@ This package includes files needed for development.
 %doc %{pkgdocdir}
 
 %changelog
+* Wed Aug 27 2014  Scott Cantor  <cantor.2@osu.edu>  - 1.0-1
+- Update specfile for release, with RH7 changes
+
 * Tue Sep 14 2010  Scott Cantor  <cantor.2@osu.edu>  - 0.1-1
 - Initial specfile