[cpp-xmltooling] branch master updated: CentOS 8 adjustments.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=1f275e2174957ffe197c0fbf43e49a537b06ca97

The following commit(s) were added to refs/heads/master by this push:
       new  1f275e2   CentOS 8 adjustments.
1f275e2 is described below

commit 1f275e2174957ffe197c0fbf43e49a537b06ca97
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 30 12:23:43 2019 -0400

    CentOS 8 adjustments.
---
 xmltooling.spec.in | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index aeffa61..620e39d 100644
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -13,7 +13,7 @@ BuildRequires:  libxml-security-c-devel >= 2.0.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 BuildRequires: gcc-c++, pkgconfig, zlib-devel, openssl-devel, boost-devel >= 1.32.0
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 6 && 0%{?rhel} == 7 || 0%{?amzn} >= 1
 BuildRequires: libcurl-openssl-devel >= 7.21.7
 Requires: libcurl-openssl >= 7.21.7
 %else
@@ -24,6 +24,10 @@ BuildRequires: curl-devel >= 7.10.6
 BuildRequires: redhat-rpm-config
 %endif
 
+%if 0%{?rhel} == 8
+BuildRequires: gdb
+%endif
+
 %if "%{_vendor}" == "suse"
 %define pkgdocdir %{_docdir}/%{name}
 %else
@@ -31,7 +35,7 @@ BuildRequires: redhat-rpm-config
 %endif
 
 # Prevent the RHEL/etc 6+ package from requiring a vanilla libcurl.
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 6 && 0%{?rhel} == 7 || 0%{?amzn} >= 1
 %filter_from_requires /libcurl\.so\..*/d
 %filter_setup
 %endif
@@ -48,7 +52,7 @@ Summary:    OpenSAML XMLTooling library
 Group:      Development/Libraries/C and C++
 Provides:   @PACKAGE_NAME@ = %{version}-%{release}
 Obsoletes:  @PACKAGE_NAME@ < %{version}-%{release}
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 6 && 0%{?rhel} == 7 || 0%{?amzn} >= 1
 Requires: libcurl-openssl >= 7.21.7
 %endif
 
@@ -72,7 +76,7 @@ Requires: libxml-security-c-devel >= 2.0.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 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 6 && 0%{?rhel} == 7 || 0%{?amzn} >= 1
 Requires: libcurl-openssl-devel >= 7.21.7
 %else
 Requires: curl-devel >= 7.10.6
@@ -104,7 +108,7 @@ This package includes XML schemas and related files.
 %setup -q
 
 %build
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 6 && 0%{?rhel} == 7 || 0%{?amzn} >= 1
 %configure %{?@PACKAGE_NAME at _options} %{!?_without_xmlsec: --with-xmlsec} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
 %else
 %configure %{?@PACKAGE_NAME at _options} %{!?_without_xmlsec: --with-xmlsec}
@@ -122,13 +126,9 @@ This package includes XML schemas and related files.
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%ifnos solaris2.8 solaris2.9 solaris2.10
 %post -n lib at PACKAGE_NAME@8 -p /sbin/ldconfig
-%endif
 
-%ifnos solaris2.8 solaris2.9 solaris2.10
 %postun -n lib at PACKAGE_NAME@8 -p /sbin/ldconfig
-%endif
 
 %files -n lib at PACKAGE_NAME@8
 %defattr(-,root,root,-)
@@ -149,6 +149,9 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Mon Sep 30 2019 Scott Cantor <cantor.2 at osu.edu> - 3.0.4-1
+- CentOS 8 cleanup
+
 * Tue Nov 21 2017 Scott Cantor <cantor.2 at osu.edu> - 3.0.0-1
 - Update soname
 - Require Xerces 3.2 as shipped by me on all platforms

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.