[cpp-linbuild] 16/25: Update shibboleth-sp and constituents to 3.2.0

Scott Cantor cantor.2 at osu.edu
Mon Apr 5 12:46:59 UTC 2021


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

scantor pushed a commit to branch main
in repository cpp-linbuild.

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

commit ba0cbe38c4a0c1ef21bb379c2a5b92dea2cf462b
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Wed Dec 23 14:44:26 2020 -0500

    Update shibboleth-sp and constituents to 3.2.0
---
 Makefile                     |  7 ++--
 common/SPECS/opensaml.spec   | 25 +++++++-----
 common/SPECS/shibboleth.spec | 90 ++++++++++++++++++++++++--------------------
 common/SPECS/xmltooling.spec | 25 ++++++++----
 4 files changed, 86 insertions(+), 61 deletions(-)

diff --git a/Makefile b/Makefile
index abb5a17..8d28ca2 100644
--- a/Makefile
+++ b/Makefile
@@ -87,21 +87,21 @@ CURLOPENSSL_VALID_PLATFORMS=centos7
 
 # Look closely: these variables refer to the OPENSAML variables
 XMLTOOLING_COMPNAME=xmltooling
-XMLTOOLING_VERSION=3.0.4
+XMLTOOLING_VERSION=3.2.0
 XMLTOOLING_DISTFILE=$(XMLTOOLING_COMPNAME)-$(XMLTOOLING_VERSION).$(DEFAULT_DIST_EXT)
 XMLTOOLING_URL=https://shibboleth.net/downloads/c++-opensaml/$(OPENSAML_VERSION)/$(XMLTOOLING_DISTFILE)
 XMLTOOLING_DEPENDS=LOG4SHIB XERCESC XMLSECURITYC
 XMLTOOLING_DEPENDS_centos7=CURLOPENSSL
 
 OPENSAML_COMPNAME=opensaml
-OPENSAML_VERSION=3.0.1
+OPENSAML_VERSION=3.2.0
 OPENSAML_DISTFILE=$(OPENSAML_COMPNAME)-$(OPENSAML_VERSION).$(DEFAULT_DIST_EXT)
 OPENSAML_URL=https://shibboleth.net/downloads/c++-$(OPENSAML_COMPNAME)/$(OPENSAML_VERSION)/$(OPENSAML_DISTFILE)
 OPENSAML_DEPENDS=LOG4SHIB XERCESC XMLSECURITYC XMLTOOLING
 
 SHIBBOLETH_COMPNAME=shibboleth
 SHIBBOLETH_DISTNAME=shibboleth-sp
-SHIBBOLETH_VERSION=3.0.4
+SHIBBOLETH_VERSION=3.2.0
 SHIBBOLETH_DISTFILE=$(SHIBBOLETH_DISTNAME)-$(SHIBBOLETH_VERSION).$(DEFAULT_DIST_EXT)
 SHIBBOLETH_URL=https://shibboleth.net/downloads/service-provider/$(SHIBBOLETH_VERSION)/$(SHIBBOLETH_DISTFILE)
 SHIBBOLETH_DEPENDS=LOG4SHIB XERCESC XMLSECURITYC XMLTOOLING OPENSAML
@@ -204,7 +204,6 @@ endef
 $(foreach platform,$(PLATFORMS),$(foreach component,$(COMPONENTS),$(eval $(call build-component-platform,$(component),$(platform)))))
 
 # TODO:
-#  update components to latest versions (opensaml 3.1.0, sp 3.1.0.2)
 #  delete stale products on version bump
 #  add a clean target
 #  teach each image to depend on the build scripts for that image
diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index 493f20b..e2f43af 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -1,5 +1,5 @@
 Name:		opensaml
-Version:	3.0.1
+Version:	3.2.0
 Release:	1
 Summary:	OpenSAML SAML library
 Group:		Development/Libraries/C and C++
@@ -10,7 +10,7 @@ Source0:	%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:  libxerces-c-devel >= 3.2
 BuildRequires:  libxml-security-c-devel >= 2.0.0
-BuildRequires:  libxmltooling-devel >= 3.0.0
+BuildRequires:  libxmltooling-devel >= 3.2.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
 BuildRequires: gcc-c++, pkgconfig, boost-devel >= 1.32.0
@@ -45,13 +45,13 @@ that support the SAML 1.0, 1.1, and 2.0 specifications.
 
 This package contains the utility programs.
 
-%package -n libsaml10
+%package -n libsaml12
 Summary:    OpenSAML SAML library
 Group:      Development/Libraries/C and C++
 Provides:   opensaml = %{version}-%{release}
 Obsoletes:  opensaml < %{version}-%{release}
 
-%description -n libsaml10
+%description -n libsaml12
 OpenSAML is an open source implementation of the OASIS Security Assertion
 Markup Language Specification. It contains a set of open source C++ classes
 that support the SAML 1.0, 1.1, and 2.0 specifications.
@@ -61,12 +61,12 @@ This package contains just the shared library.
 %package -n libsaml-devel
 Summary:	OpenSAML development Headers
 Group:		Development/Libraries/C and C++
-Requires:	libsaml10 = %{version}-%{release}
+Requires:	libsaml12 = %{version}-%{release}
 Provides:	opensaml-devel = %{version}-%{release}
 Obsoletes:	opensaml-devel < %{version}-%{release}
 Requires: libxerces-c-devel >= 3.2
 Requires: libxml-security-c-devel >= 2.0.0
-Requires: libxmltooling-devel >= 3.0.0
+Requires: libxmltooling-devel >= 3.2.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
 
@@ -110,15 +110,15 @@ This package includes XML schemas and related files.
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -n libsaml10 -p /sbin/ldconfig
+%post -n libsaml12 -p /sbin/ldconfig
 
-%postun -n libsaml10 -p /sbin/ldconfig
+%postun -n libsaml12 -p /sbin/ldconfig
 
 %files -n opensaml-bin
 %defattr(-,root,root,-)
 %{_bindir}/samlsign
 
-%files -n libsaml10
+%files -n libsaml12
 %defattr(-,root,root,-)
 %{_libdir}/libsaml.so.*
 %exclude %{_libdir}/libsaml.la
@@ -136,6 +136,13 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Wed Dec 2 2020 Scott Cantor <cantor.2 at osu.edu> - 3.2.0-1
+- Version and lib bump
+
+* Mon Feb 3 2020 Scott Cantor <cantor.2 at osu.edu> - 3.1.0-1
+- Version and lib bump
+- Remove Solaris conditionals
+
 * Mon Sep 30 2019 Scott Cantor <cantor.2 at osu.edu> - 3.0.1-1
 - CentOS 8 cleanup
 
diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index b4270a8..7d19b04 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -1,5 +1,5 @@
 Name:		shibboleth
-Version:	3.0.4
+Version:	3.2.0
 Release:	1
 Summary:	Open source system for attribute-based Web SSO
 Group:		Productivity/Networking/Security
@@ -10,24 +10,30 @@ Source:		%{name}-sp-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-sp-%{version}-root
 Obsoletes:	shibboleth-sp = 2.5.0
 Requires:	openssl
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
-PreReq:		xmltooling-schemas%{?_isa} >= 3.0.0, opensaml-schemas%{?_isa} >= 3.0.0
+%if 0%{?rhel} >= 6 || 0%{?amzn} >= 1
+PreReq:		xmltooling-schemas%{?_isa} >= 3.2.0, opensaml-schemas%{?_isa} >= 3.2.0
 %else
-PreReq:		xmltooling-schemas >= 3.0.0, opensaml-schemas >= 3.0.0
+PreReq:		xmltooling-schemas >= 3.2.0, opensaml-schemas >= 3.2.0
 %endif
 %if 0%{?suse_version} > 1030 && 0%{?suse_version} < 1130
 PreReq:		%{insserv_prereq} %{fillup_prereq}
 %endif
-%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+%if 0%{?rhel} >= 7
+Requires: hostname
 BuildRequires:  systemd-devel
+%else
+Requires: net-tools
+%endif
+%if 0%{?rhel} >= 8
+BuildRequires:  gdb
 %endif
 BuildRequires:  libxerces-c-devel >= 3.2
 BuildRequires:	libxml-security-c-devel >= 2.0.0
-BuildRequires:	libxmltooling-devel >= 3.0.0
-BuildRequires:	libsaml-devel >= 3.0.0
+BuildRequires:	libxmltooling-devel >= 3.1.0
+BuildRequires:	libsaml-devel >= 3.1.0
 %{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 2}
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
 Requires:	libcurl-openssl%{?_isa} >= 7.21.7
 BuildRequires:	chrpath
 %endif
@@ -39,12 +45,12 @@ BuildRequires:  gcc-c++, pkgconfig, boost-devel >= 1.32.0
 %{!?_without_doxygen:BuildRequires: doxygen}
 %{!?_without_odbc:BuildRequires:unixODBC-devel}
 %{?_with_fastcgi:BuildRequires: fcgi-devel}
-%if 0%{?centos_version} >= 600
+%if 0%{?centos} == 6 || 0%{?centos} == 7
 BuildRequires:	libmemcached-devel
 %endif
 %{?_with_memcached:BuildRequires: libmemcached-devel}
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+%if 0%{?rhel} >= 6 || 0%{?amzn} >= 1
 %{!?_without_builtinapache:BuildRequires: httpd-devel%{?_isa}}
 %else
 %{!?_without_builtinapache:BuildRequires: httpd-devel}
@@ -87,8 +93,8 @@ Requires:	%{name} = %{version}-%{release}
 Obsoletes:	shibboleth-sp-devel = 2.5.0
 Requires:	libxerces-c-devel >= 3.2
 Requires: 	libxml-security-c-devel >= 2.0.0
-Requires: 	libxmltooling-devel >= 3.0.0
-Requires: 	libsaml-devel >= 3.0.0
+Requires: 	libxmltooling-devel >= 3.1.0
+Requires: 	libsaml-devel >= 3.1.0
 %{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
 %{!?_with_log4cpp:Requires: liblog4shib-devel >= 2}
 
@@ -107,13 +113,16 @@ This package includes files needed for development with Shibboleth.
     %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_systemd:--enable-systemd} %{?shib_options} PKG_CONFIG_PATH=./pkgconfig-workarounds/opensuse13
 %else
 %if 0%{?suse_version} >= 1210
-	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_systemd:--enable-systemd} %{?shib_options}
+    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_systemd:--enable-systemd} %{?shib_options}
 %else
-%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
-	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{!?_without_systemd:--enable-systemd} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
+%if 0%{?rhel} >= 8
+    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with-memcached} %{!?_without_systemd:--enable-systemd} %{?shib_options}
 %else
-%if 0%{?centos_version} >= 600
-	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
+%if 0%{?rhel} >= 7
+    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{!?_without_systemd:--enable-systemd} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
+%else
+%if 0%{?centos} >= 6
+    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{!?_without_memcached:--with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
 %else
 %if 0%{?rhel} >= 6
     %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
@@ -121,7 +130,8 @@ This package includes files needed for development with Shibboleth.
 %if 0%{?rhel} >= 5
     %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options} PKG_CONFIG_PATH=./pkgconfig-workarounds/rh5
 %else
-	%configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options}
+    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options}
+%endif
 %endif
 %endif
 %endif
@@ -171,7 +181,7 @@ fi
 
 # Establish location of systemd file, if any.
 SYSTEMD_SHIBD="no"
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
 	%{__mkdir} -p $RPM_BUILD_ROOT%{_unitdir}
 	echo "%attr(0444,-,-) %{_unitdir}/shibd.service" >> rpm.filelist
 	SYSTEMD_SHIBD="$RPM_BUILD_ROOT%{_unitdir}/shibd.service"
@@ -205,14 +215,14 @@ if [ "$SYSTEMD_SHIBD" != "no" ] ; then
 [Unit]
 Description=Shibboleth Service Provider Daemon
 Documentation=https://wiki.shibboleth.net/confluence/display/SP3/Home
-After=network.target
+After=network-online.target
 Before=httpd.service
 
 [Service]
 Type=notify
 NotifyAccess=main
 User=%{runuser}
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
 Environment=LD_LIBRARY_PATH=/opt/shibboleth/%{_lib}
 %endif
 ExecStart=%{_sbindir}/shibd -f -F
@@ -241,7 +251,7 @@ SHIBD_USER=%{runuser}
 # Wait period (secs) for configuration (and metadata) to load
 SHIBD_WAIT=30
 EOF
-	%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+	%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
 		cat >> $SYSCONFIG_SHIBD <<EOF
 
 # Override OS-supplied libcurl
@@ -250,7 +260,7 @@ EOF
 	%endif
 fi
 
-%if 0%{?rhel} >= 6 || 0%{?centos_version} >= 600 || 0%{?amzn} >= 1
+%if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
 	# Strip existing rpath to libcurl.
 	chrpath -d $RPM_BUILD_ROOT%{_sbindir}/shibd
 	chrpath -d $RPM_BUILD_ROOT%{_bindir}/mdquery
@@ -285,17 +295,7 @@ getent passwd %{runuser} >/dev/null || useradd -r -g %{runuser} \
 exit 0
 
 %post
-%ifnos solaris2.8 solaris2.9 solaris2.10 solaris2.11
 /sbin/ldconfig
-%endif
-
-# Key ownership fix.
-if [ -f %{_sysconfdir}/shibboleth/sp-key.pem ] ; then
-	%{__chown} %{runuser}:%{runuser} %{_sysconfdir}/shibboleth/sp-key.pem %{_sysconfdir}/shibboleth/sp-cert.pem 2>/dev/null || :
-fi
-
-# Fix ownership of log files (even on new installs, if they're left from an older one).
-%{__chown} %{runuser}:%{runuser} %{_localstatedir}/log/shibboleth/* 2>/dev/null || :
 
 # Generate two keys on new installs.
 if [ $1 -eq 1 ] ; then
@@ -324,7 +324,7 @@ if [ $1 -gt 1 ] ; then
 		fi
 	fi
 
-%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+%if 0%{?rhel} >= 7
 	# Initial prep for systemd
 	%systemd_post shibd.service
 	if [ $1 -gt 1 ] ; then
@@ -351,7 +351,7 @@ if [ $1 -gt 1 ] ; then
 %preun
 # On final removal, stop shibd and remove service, restart Apache if running.
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
-%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+%if 0%{?rhel} >= 7
 	%systemd_preun shibd.service
 %else
 	if [ $1 -eq 0 ] ; then
@@ -361,6 +361,7 @@ if [ $1 -gt 1 ] ; then
 %endif
 	if [ $1 -eq 0 ] ; then
 		%{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
+		exit 0
 	fi
 %endif
 %if "%{_vendor}" == "suse"
@@ -371,17 +372,16 @@ if [ $1 -gt 1 ] ; then
 %endif
 	if [ $1 -eq 0 ] ; then
 		%{!?_without_builtinapache:/sbin/service apache2 status 1>/dev/null && /sbin/service apache2 restart 1>/dev/null}
+		exit 0
 	fi
 %endif
 exit 0
 
 %postun
-%ifnos solaris2.8 solaris2.9 solaris2.10 solaris2.11
 /sbin/ldconfig
-%endif
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
 # On upgrade, restart components if they're already running.
-%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+%if 0%{?rhel} >= 7
 	%systemd_postun_with_restart shibd.service
 %else
 	if [ $1 -ge 1 ] ; then
@@ -447,7 +447,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/shibboleth/*.html
 %config(noreplace) %{_sysconfdir}/shibboleth/*.logger
 %if "%{_vendor}" == "redhat"
-%if 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+%if 0%{?rhel} >= 7
 %else
 %config %{_initrddir}/shibd
 %endif
@@ -459,7 +459,7 @@ exit 0
 %config %{_initrddir}/shibd
 %{_sbindir}/rcshibd
 %endif
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?centos_version} >= 700
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
 %{_tmpfilesdir}/%{name}.conf
 %endif
 %{_sysconfdir}/shibboleth/example-shibboleth2.xml
@@ -481,6 +481,16 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %changelog
+* Tue Dec 1 2020 Scott Cantor <cantor.2 at osu.edu> - 3.2.0-1
+- Version and lib bump
+
+* Mon Feb 3 2020 Scott Cantor <cantor.2 at osu.edu> - 3.1.0-1
+- Version and lib bump
+- Add hostname dependency for keygen script
+
+* Mon Sep 30 2019 Scott Cantor <cantor.2 at osu.edu> - 3.0.4-1
+- CentOS 8 cleanup
+
 * Mon Apr 30 2018 Scott Cantor <cantor.2 at osu.edu> - 3.0.0-1
 - Bump dependency versions
 - Require updated libraries across the board
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index 30541c5..eda29ea 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -1,5 +1,5 @@
 Name:		xmltooling
-Version:	3.0.4
+Version:	3.2.0
 Release:	1
 Summary:	OpenSAML XML Processing library
 Group:		Development/Libraries/C and C++
@@ -34,7 +34,7 @@ BuildRequires: gdb
 %define pkgdocdir %{_docdir}/%{name}-%{version}
 %endif
 
-# Prevent the RHEL/etc 6/7 package from requiring a vanilla libcurl.
+# Prevent the RHEL/etc 6+ package from requiring a vanilla libcurl.
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?amzn} >= 1
 %filter_from_requires /libcurl\.so\..*/d
 %filter_setup
@@ -47,7 +47,7 @@ for declaring element- and type-specific API and implementation
 classes to add value around the DOM, as well as signing and encryption
 support.
 
-%package -n libxmltooling8
+%package -n libxmltooling10
 Summary:    OpenSAML XMLTooling library
 Group:      Development/Libraries/C and C++
 Provides:   xmltooling = %{version}-%{release}
@@ -56,7 +56,7 @@ Obsoletes:  xmltooling < %{version}-%{release}
 Requires: libcurl-openssl >= 7.21.7
 %endif
 
-%description -n libxmltooling8
+%description -n libxmltooling10
 The XMLTooling library contains generic XML parsing and processing
 classes based on the Xerces-C DOM. It adds more powerful facilities
 for declaring element- and type-specific API and implementation
@@ -68,7 +68,7 @@ This package contains just the shared library.
 %package -n libxmltooling-devel
 Summary:	XMLTooling development Headers
 Group:		Development/Libraries/C and C++
-Requires:	libxmltooling8 = %{version}-%{release}
+Requires:	libxmltooling10 = %{version}-%{release}
 Provides:	xmltooling-devel = %{version}-%{release}
 Obsoletes:	xmltooling-devel < %{version}-%{release}
 Requires:  libxerces-c-devel >= 3.2
@@ -126,11 +126,11 @@ This package includes XML schemas and related files.
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%post -n libxmltooling8 -p /sbin/ldconfig
+%post -n libxmltooling10 -p /sbin/ldconfig
 
-%postun -n libxmltooling8 -p /sbin/ldconfig
+%postun -n libxmltooling10 -p /sbin/ldconfig
 
-%files -n libxmltooling8
+%files -n libxmltooling10
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %exclude %{_libdir}/*.la
@@ -149,6 +149,15 @@ This package includes XML schemas and related files.
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Dec 2 2020 Scott Cantor <cantor.2 at osu.edu> - 3.2.0-1
+- Version bump
+
+* Mon Feb 3 2020 Scott Cantor <cantor.2 at osu.edu> - 3.1.0-1
+- Version and lib bump
+
+* 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.


More information about the commits mailing list