[cpp-linbuild] 13/25: Revert "Update xerces-c to 3.2.3"

Mon Apr 5 12:46:56 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=1253b4fd7d72851108d640bdb68fa35caac3d256

commit 1253b4fd7d72851108d640bdb68fa35caac3d256
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Wed Dec 23 13:12:41 2020 -0500

    Revert "Update xerces-c to 3.2.3"
    
    This reverts commit 29fba75c48b22ee2be66861380cfbe51a69a149b.
---
 Makefile                   |   4 +-
 common/SPECS/xerces-c.spec | 117 ++++++++++++++++++++++++++++-----------------
 2 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/Makefile b/Makefile
index 30f4ef3..f13cb0d 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ LOG4SHIB_DISTFILE=$(LOG4SHIB_COMPNAME)-$(LOG4SHIB_VERSION).$(DEFAULT_DIST_EXT)
 LOG4SHIB_URL=https://shibboleth.net/downloads/$(LOG4SHIB_COMPNAME)/$(LOG4SHIB_VERSION)/$(LOG4SHIB_DISTFILE)
 
 XERCESC_COMPNAME=xerces-c
-XERCESC_VERSION=3.2.3
+XERCESC_VERSION=3.2.1
 XERCESC_MAJORVER=3
 XERCESC_DISTFILE=$(XERCESC_COMPNAME)-$(XERCESC_VERSION).$(DEFAULT_DIST_EXT)
 XERCESC_URL=https://archive.apache.org/dist/xerces/c/$(XERCESC_MAJORVER)/sources/$(XERCESC_DISTFILE)
@@ -204,7 +204,7 @@ 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)
+#  update components to latest versions (opensaml 3.1.0, xerces-c 3.2.3, 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/xerces-c.spec b/common/SPECS/xerces-c.spec
index a115f25..a49781b 100644
--- a/common/SPECS/xerces-c.spec
+++ b/common/SPECS/xerces-c.spec
@@ -1,16 +1,23 @@
-Summary:	Xerces-C++ validating XML parser
-Name:		xerces-c
-Version:	3.2.3
-Release:	1
-URL:		http://xerces.apache.org/xerces-c/
-Source0:	%{name}-%{version}.tar.bz2
-License:        Apache
-Group:		Libraries
-BuildRoot:	%{_tmppath}/%{name}-root
-Prefix:		/usr
+Summary:    Xerces-C++ validating XML parser
+Name:       xerces-c
+Version:    3.2.1
+Release:    1
+URL:        http://xerces.apache.org/xerces-c/
+Source0:    %{name}-%{version}.tar.bz2
+License:    Apache
+Group:      Libraries
+BuildRoot:  %{_tmppath}/%{name}-root
+Prefix:     /usr
+BuildRequires: gcc-c++ pkgconfig
 %{?_with_curl:BuildRequires: curl-devel}
 %{?_with_icu:BuildRequires: libicu-devel}
+%if "%{_vendor}" == "redhat"
+BuildRequires: redhat-rpm-config
+%endif
 
+%if 0%{?rhel} >= 8 || 0%{?centos_version} >= 800
+BuildRequires: gdb
+%endif
 
 %description
 Xerces-C++ is a validating XML parser written in a portable subset of C++.
@@ -18,72 +25,96 @@ Xerces-C++ makes it easy to give your application the ability to read and
 write XML data. A shared library is provided for parsing, generating,
 manipulating, and validating XML documents.
 
-The parser provides high performance, modularity, and scalability. Source
-code, samples and API documentation are provided with the parser. For
-portability, care has been taken to make minimal use of templates and
-minimal use of #ifdefs.
+%package -n xerces-c-bin
+Summary:    Utilities for Xerces-C++ validating XML parser
+Group:      Development/Libraries
 
-%package devel
-Requires:	%{name} = %{version}
-Group:		Development/Libraries
-Summary:	Header files for Xerces-C++ validating XML parser
+%description -n xerces-c-bin
+Xerces-C++ is a validating XML parser written in a portable subset of C++.
+Xerces-C++ makes it easy to give your application the ability to read and
+write XML data. A shared library is provided for parsing, generating,
+manipulating, and validating XML documents.
 
-%description devel
-Header files you can use to develop XML applications with Xerces-C++.
+This package contains the utility programs.
 
+%package -n libxerces-c-3_2
+Summary:    Shared library for Xerces-C++ validating XML parser
+Group:      Development/Libraries
+Provides:   xerces-c = %{version}-%{release}
+
+%description -n libxerces-c-3_2
 Xerces-C++ is a validating XML parser written in a portable subset of C++.
 Xerces-C++ makes it easy to give your application the ability to read and
 write XML data. A shared library is provided for parsing, generating,
 manipulating, and validating XML documents.
 
+This package contains just the shared library.
+
+%package -n libxerces-c-devel
+Group:      Development/Libraries
+Summary:    Header files for Xerces-C++ validating XML parser
+Requires:   libxerces-c-3_2 = %{version}-%{release}
+Provides:   xerces-c-devel = %{version}-%{release}
+
+%description -n libxerces-c-devel
+Xerces-C++ is a validating XML parser written in a portable subset of C++.
+Xerces-C++ makes it easy to give your application the ability to read and
+write XML data. A shared library is provided for parsing, generating,
+manipulating, and validating XML documents.
+
+The static libraries and header files needed for development with Xerces-C++.
+
 %prep
 %setup -q
 
 %build
-%configure %{!?_without_curl:--enable-netaccessor-curl} %{?_with_icu:--enable-transcoder-icu --enable-msgloader-icu} %{?xerces_options}
+%configure %{?_with_curl:--enable-netaccessor-curl} %{!?_with_curl:--disable-netaccessor-curl} %{?_with_icu:--enable-transcoder-icu --enable-msgloader-icu} %{?xerces_options}
 %{__make}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
-%ifnos solaris2.8 solaris2.9 solaris2.10
-%post -p /sbin/ldconfig
-%endif
+%post -n libxerces-c-3_2 -p /sbin/ldconfig
 
-%ifnos solaris2.8 solaris2.9 solaris2.10
-%postun -p /sbin/ldconfig
-%endif
+%postun -n libxerces-c-3_2 -p /sbin/ldconfig
 
-%files
+%files -n xerces-c-bin
 %defattr(755,root,root)
 %{_bindir}/*
-%{_libdir}/lib%{name}-*.so
-%exclude %{_libdir}/lib%{name}.la
 
+%files -n libxerces-c-3_2
+%defattr(755,root,root)
+%{_libdir}/libxerces-c-*.so
 
-%files devel
+%files -n libxerces-c-devel
 %defattr(-,root,root)
 %{_includedir}/xercesc
-%{_libdir}/lib%{name}.so
-%{_libdir}/lib%{name}.a
-%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/libxerces-c.so
+%{_libdir}/libxerces-c.a
+%{_libdir}/pkgconfig/xerces-c.pc
+%exclude %{_libdir}/libxerces-c.la
 
 %changelog
-* Mon Dec 30 2019 Scott Cantor <cantor.2 at osu.edu>
-- Upped version
+* Tue May 1 2018 Scott Cantor <cantor.2 at osu.edu> 3.2.0-1
+- Bump version
+
+* Thu Feb 19 2015 Scott Cantor <cantor.2 at osu.edu> 3.1.2-1
+- Bump version, and remove Obsoletes
+
+* Thu Apr 29 2010 Scott Cantor <cantor.2 at osu.edu> 3.1.1-1
+- Bump version and fix Provides/Obsoletes versioning
 
-* Wed Jun 21 2017 Scott Cantor <cantor.2 at osu.edu>
-- Upped version
+* Sun Feb 14 2010 Scott Cantor <cantor.2 at osu.edu> 3.1.0-1
+- Bump version
 
-* Thu Jun 9 2016 Scott Cantor <cantor.2 at osu.edu>
-- Upped version
+* Mon Dec 28 2009 Scott Cantor <cantor.2 at osu.edu> 3.0.1-2
+- Sync package names for side by side installation
 
-* Fri Feb 27 2015 Scott Cantor <cantor.2 at osu.edu>
-- Upped version and avoided ownership of /usr/include
+* Wed Aug  5 2009 Scott Cantor <cantor.2 at osu.edu> 3.0.1-1
+- Disabled curl thanks to Red Hat
 
 * Fri Mar  7 2008 Boris Kolpackov <boris at codesynthesis.com>
 - Integrated updates for 3.0.0 from Scott Cantor.

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