From 76e334d3cb8f44b20b00565b5b67938d1e065201 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:45:29 +0000 Subject: [PATCH 01/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 18d7d7789d29882a8e0f43906e41d83df97f385e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 1 Aug 2022 15:13:06 +0200 Subject: [PATCH 02/37] Rebuilt for ICU 71.1 From c6181b337e35844b7689ca8c9cd9ffb484d005bd Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 29 Nov 2022 14:35:47 -0500 Subject: [PATCH 03/37] Update License to SPDX --- xalan-c.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xalan-c.spec b/xalan-c.spec index 82e6bd0..07c5137 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -10,7 +10,10 @@ Version: 1.12.0 Release: %autorelease Summary: Xalan XSLT processor for C/C++ -License: ASL 2.0 +# The entire source is Apache-2.0, except cmake/RunTest.cmake, which is +# libtiff, but is a build-system file that does not contribute to the licenses +# of the binary RPMs. +License: Apache-2.0 URL: http://xalan.apache.org/xalan-c/ %global tag Xalan-C_%(echo '%{version}' | tr . _) %global tar_name xalan_c-%(echo %{version} | cut -d . -f -2) From a867aba389eeacb1037de3246054167efc72ed11 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 22 Dec 2022 13:06:30 -0500 Subject: [PATCH 04/37] Indicate dirs. in files list with trailing slashes --- xalan-c.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xalan-c.spec b/xalan-c.spec index 07c5137..8c26aab 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -113,21 +113,26 @@ rm -rf %{buildroot}%{_prefix}/share/doc/xalan-c/api %files devel %{_libdir}/libxalanMsg.so %{_libdir}/libxalan-c.so + %{_includedir}/xalanc/ + %dir %{_libdir}/cmake/XalanC %{_libdir}/cmake/XalanC/*.cmake + %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/xalan-c.pc %files doc %license LICENSE + %doc CREDITS %doc KEYS %doc NOTICE %doc README.md -%doc docs/*.md docs/images -%doc samples +%doc docs/*.md +%doc docs/images/ +%doc samples/ %changelog From 13e310aacc4997a55f552d113d04b212285f0bc2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 22 Dec 2022 13:06:35 -0500 Subject: [PATCH 05/37] Trivially simplify one files list --- xalan-c.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xalan-c.spec b/xalan-c.spec index 8c26aab..daab6b5 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -103,11 +103,11 @@ rm -rf %{buildroot}%{_prefix}/share/doc/xalan-c/api %doc KEYS %doc NOTICE %doc README.md + %{_bindir}/Xalan -%{_libdir}/libxalanMsg.so.%{so_version} -%{_libdir}/libxalanMsg.so.%{so_version}.* -%{_libdir}/libxalan-c.so.%{so_version} -%{_libdir}/libxalan-c.so.%{so_version}.* + +%{_libdir}/libxalanMsg.so.%{so_version}{,.*} +%{_libdir}/libxalan-c.so.%{so_version}{,.*} %files devel From 4af08bbc2319c7b1cac6aa188c76fb1ba7fb1bce Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sat, 31 Dec 2022 03:51:03 +0000 Subject: [PATCH 06/37] Rebuild for ICU 72 From ca4c1ee033078af9a4045e939e8a9298be31a452 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:07:19 +0000 Subject: [PATCH 07/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 6d018f8a3e982fbd4c251b883aa2064e7cf03c00 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 18 Jun 2023 12:11:59 -0400 Subject: [PATCH 08/37] Use new (rpm 4.17.1+) bcond style --- xalan-c.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xalan-c.spec b/xalan-c.spec index daab6b5..4f35c72 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -1,4 +1,5 @@ -%bcond_without icu +%bcond icu 1 + Name: xalan-c Version: 1.12.0 # The soversion is made from the major and minor version numbers, e.g. 112 for From 55784e1b49c2b756f83611b4f2c19002f42f0007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 22:23:28 +0200 Subject: [PATCH 09/37] Rebuilt for ICU 73.2 From 1ce3c9018f9928b924934c16008bcca4bc33e555 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:29:38 +0000 Subject: [PATCH 10/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From f27faf6993739a2bdec40b719d3fdcc860381c7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:18:08 +0000 Subject: [PATCH 11/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3c013e931d94505b9467ba63cc653695c74c0dee Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 31 Jan 2024 20:27:05 +0000 Subject: [PATCH 12/37] Rebuild for ICU 74 From e6a89aacd4e3608e382252ae496b88d9bb4ac99d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 27 Feb 2024 08:35:47 -0500 Subject: [PATCH 13/37] Put the GitHub URL in its own macro [skip changelog] --- xalan-c.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xalan-c.spec b/xalan-c.spec index 4f35c72..0bdfdc3 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -15,13 +15,14 @@ Summary: Xalan XSLT processor for C/C++ # libtiff, but is a build-system file that does not contribute to the licenses # of the binary RPMs. License: Apache-2.0 -URL: http://xalan.apache.org/xalan-c/ +URL: http://apache.github.io/xalan-c/ %global tag Xalan-C_%(echo '%{version}' | tr . _) %global tar_name xalan_c-%(echo %{version} | cut -d . -f -2) -%global release_url https://github.com/apache/xalan-c/releases/download/%{tag} -Source0: %{release_url}/%{tar_name}.tar.gz -Source1: %{release_url}/%{tar_name}.tar.gz.asc -Source2: %{release_url}/KEYS +%global forgeurl https://github.com/apache/xalan-c/ +%global releaseurl %{forgeurl}/releases/download/%{tag} +Source0: %{releaseurl}/%{tar_name}.tar.gz +Source1: %{releaseurl}/%{tar_name}.tar.gz.asc +Source2: %{releaseurl}/KEYS BuildRequires: gnupg2 BuildRequires: cmake From 3a8edd582c7cbf9b12deaad8d12fb7efde038aed Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 27 Feb 2024 08:39:21 -0500 Subject: [PATCH 14/37] F39+: Form release tag name without a subshell [skip changelog] --- xalan-c.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xalan-c.spec b/xalan-c.spec index 0bdfdc3..9b3737d 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -16,7 +16,7 @@ Summary: Xalan XSLT processor for C/C++ # of the binary RPMs. License: Apache-2.0 URL: http://apache.github.io/xalan-c/ -%global tag Xalan-C_%(echo '%{version}' | tr . _) +%global tag Xalan-C_%{gsub %{version} . _} %global tar_name xalan_c-%(echo %{version} | cut -d . -f -2) %global forgeurl https://github.com/apache/xalan-c/ %global releaseurl %{forgeurl}/releases/download/%{tag} From e643033a294c973d60732a1983cade3e02b467ab Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 27 Feb 2024 08:37:08 -0500 Subject: [PATCH 15/37] Switch URL from HTTP to HTTPS --- xalan-c.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xalan-c.spec b/xalan-c.spec index 9b3737d..71fe015 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -15,7 +15,7 @@ Summary: Xalan XSLT processor for C/C++ # libtiff, but is a build-system file that does not contribute to the licenses # of the binary RPMs. License: Apache-2.0 -URL: http://apache.github.io/xalan-c/ +URL: https://apache.github.io/xalan-c/ %global tag Xalan-C_%{gsub %{version} . _} %global tar_name xalan_c-%(echo %{version} | cut -d . -f -2) %global forgeurl https://github.com/apache/xalan-c/ From 21057a2f3fcc03b25c6a06b309c6dcde072afa2b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:38:06 -0400 Subject: [PATCH 16/37] Save some space in the -doc subpackage by hardlinking duplicate files --- xalan-c.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xalan-c.spec b/xalan-c.spec index 71fe015..fa83f3e 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -29,6 +29,8 @@ BuildRequires: cmake # Either make or ninja is supported. BuildRequires: ninja-build BuildRequires: gcc-c++ +BuildRequires: hardlink + BuildRequires: xerces-c-devel %if %{with icu} BuildRequires: libicu-devel @@ -94,6 +96,11 @@ rm -vf samples/configure samples/configure.in # the HTML version of the API documentation. rm -rf %{buildroot}%{_prefix}/share/doc/xalan-c/api +install -t '%{buildroot}%{_docdir}/%{name}-doc' -D -p -m 0644 \ + CREDITS KEYS NOTICE README.md docs/*.md +cp -rvp docs/images/ samples/ '%{buildroot}%{_docdir}/%{name}-doc' +hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' + %check %ctest @@ -128,13 +135,7 @@ rm -rf %{buildroot}%{_prefix}/share/doc/xalan-c/api %files doc %license LICENSE -%doc CREDITS -%doc KEYS -%doc NOTICE -%doc README.md -%doc docs/*.md -%doc docs/images/ -%doc samples/ +%{_docdir}/%{name}-doc/ %changelog From 0b91f9cbc19e60f2c04fe59d0aa29f551d48600d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:38:47 -0400 Subject: [PATCH 17/37] Treat CREDITS and NOTICE as additional license files --- xalan-c.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xalan-c.spec b/xalan-c.spec index fa83f3e..8ef0560 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -97,7 +97,7 @@ rm -vf samples/configure samples/configure.in rm -rf %{buildroot}%{_prefix}/share/doc/xalan-c/api install -t '%{buildroot}%{_docdir}/%{name}-doc' -D -p -m 0644 \ - CREDITS KEYS NOTICE README.md docs/*.md + KEYS README.md docs/*.md cp -rvp docs/images/ samples/ '%{buildroot}%{_docdir}/%{name}-doc' hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' @@ -107,10 +107,8 @@ hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' %files -%license LICENSE -%doc CREDITS +%license CREDITS LICENSE NOTICE %doc KEYS -%doc NOTICE %doc README.md %{_bindir}/Xalan @@ -133,7 +131,7 @@ hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' %files doc -%license LICENSE +%license CREDITS LICENSE NOTICE %{_docdir}/%{name}-doc/ From 53aa39d24bd3f6447518cb7d6dcfb54eca1fb639 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:39:01 -0400 Subject: [PATCH 18/37] Do not install KEYS --- xalan-c.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xalan-c.spec b/xalan-c.spec index 8ef0560..d9a4c87 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -97,7 +97,7 @@ rm -vf samples/configure samples/configure.in rm -rf %{buildroot}%{_prefix}/share/doc/xalan-c/api install -t '%{buildroot}%{_docdir}/%{name}-doc' -D -p -m 0644 \ - KEYS README.md docs/*.md + README.md docs/*.md cp -rvp docs/images/ samples/ '%{buildroot}%{_docdir}/%{name}-doc' hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' @@ -108,7 +108,6 @@ hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' %files %license CREDITS LICENSE NOTICE -%doc KEYS %doc README.md %{_bindir}/Xalan From 907fdb70b51606f2f64cc4922f360375a743babb Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:39:21 -0400 Subject: [PATCH 19/37] Do not install README.md in the base package, only in -doc --- xalan-c.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xalan-c.spec b/xalan-c.spec index d9a4c87..5e6abd1 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -108,7 +108,6 @@ hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' %files %license CREDITS LICENSE NOTICE -%doc README.md %{_bindir}/Xalan From 329bf982f9160f670921621351205f219f48dbc8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:47:18 -0400 Subject: [PATCH 20/37] Convert some stray CRNL line endings --- xalan-c.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xalan-c.spec b/xalan-c.spec index 5e6abd1..86a8d45 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -29,6 +29,8 @@ BuildRequires: cmake # Either make or ninja is supported. BuildRequires: ninja-build BuildRequires: gcc-c++ + +BuildRequires: dos2unix BuildRequires: hardlink BuildRequires: xerces-c-devel @@ -82,6 +84,12 @@ chmod -v a-x NOTICE # samples are only tested and not installed), and is annoying to exclude. rm -vf samples/configure samples/configure.in +# Convert line endings as needed: +find docs samples src -type f -exec file '{}' '+' | + grep -F 'CRLF' | + awk -F ':' '{ print $1 }' | + xargs dos2unix --keepdate + %build %cmake %{?with_icu:-Dtranscoder=icu} -GNinja From 2a9ee9a725dd9bb2b8b9b4caa55e057525bed60c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:53:36 -0400 Subject: [PATCH 21/37] Add an rpmlintrc file [skip changelog] --- xalan-c.rpmlintrc | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 xalan-c.rpmlintrc diff --git a/xalan-c.rpmlintrc b/xalan-c.rpmlintrc new file mode 100644 index 0000000..19f46cf --- /dev/null +++ b/xalan-c.rpmlintrc @@ -0,0 +1,10 @@ +# Not a real spelling error: +addFilter(r" spelling-error \('([Ss]tylesheet)s?',") +# Hardlinks within directories owned by a single package are safe. +addFilter(r" cross-directory-hard-link /\S+/xalan-c-doc/\S+ /\S+/xalan-c-doc/") +# All documentation is in the -doc subpackage. +addFilter(r" no-documentation$") +#xalan-c.x86_64: W: no-manual-page-for-binary Xalan +#xalan-c.x86_64: W: no-documentation +#xalan-c-devel.x86_64: W: no-documentation +#xalan-c-doc.x86_64: E: no-binary From df6bef35ef1c0c3491dc9b8ee14e963a68a23b7a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 10:54:09 -0400 Subject: [PATCH 22/37] Make the -doc subpackage noarch --- xalan-c.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xalan-c.spec b/xalan-c.spec index 86a8d45..5a7ee41 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -64,6 +64,7 @@ Summary: Documentation for xalan-c # Normally, we would enable the Doxygen PDF documentation as a lesser # substitute, but building it fails with: # ! TeX capacity exceeded, sorry [pool size=5905151]. +BuildArch: noarch %description doc Documentation for xalan-c. See https://apache.github.io/xalan-c/ for full HTML From 865b0715698f0670960a0bcf88010b9f13bd211a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 11:13:22 -0400 Subject: [PATCH 23/37] Split libraries into a -libs subpackage separate from the command-line tool --- xalan-c.spec | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/xalan-c.spec b/xalan-c.spec index 5a7ee41..8e88e97 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -38,16 +38,30 @@ BuildRequires: xerces-c-devel BuildRequires: libicu-devel %endif -%description +Requires: xalan-c-libs%{?_isa} = %{version}-%{release} + +%global common_description %{expand: The Apache Xalan-C++ Project provides a library and a command line program to transform XML documents using a stylesheet that conforms to XSLT 1.0 standards. -Xalan is a project of the Apache Software Foundation. +Xalan is a project of the Apache Software Foundation.} + +%description %{common_description} + +This package contains the command-line tool. + + +%package libs +Summary: Shared libraries for xalan-c + +%description libs +The xalan-c-libs package contains libraries needed by the command-line tool and +by applications that use xalan-c. %package devel Summary: Development files for xalan-c -Requires: xalan-c%{?_isa} = %{version}-%{release} +Requires: xalan-c-libs%{?_isa} = %{version}-%{release} %description devel The xalan-c-devel package contains libraries and header files for developing @@ -116,10 +130,12 @@ hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' %files -%license CREDITS LICENSE NOTICE - %{_bindir}/Xalan + +%files libs +%license CREDITS LICENSE NOTICE + %{_libdir}/libxalanMsg.so.%{so_version}{,.*} %{_libdir}/libxalan-c.so.%{so_version}{,.*} From 1026f8758b22a0b90be29aeec4d1d0363c15cff9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Apr 2024 11:33:13 -0400 Subject: [PATCH 24/37] Add a man page for the Xalan command-line tool --- Xalan.1 | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ xalan-c.spec | 5 +++++ 2 files changed, 57 insertions(+) create mode 100644 Xalan.1 diff --git a/Xalan.1 b/Xalan.1 new file mode 100644 index 0000000..28d0605 --- /dev/null +++ b/Xalan.1 @@ -0,0 +1,52 @@ +.TH XALAN "1" "April 2024" "" "User Commands" +.SH NAME +.B Xalan +\(en Transform XML documents using a stylesheet +.SH SYNOPSIS +.B Xalan +.RI [ OPTIONS ] +.I source +.I stylesheet +.SH DESCRIPTION +Transform XML documents using a stylesheet +that conforms to XSLT 1.0 standards. +.SH OPTIONS +A dash as the +.I source +argument reads from stdin. +.RB ( \- +cannot be used for both arguments.) +.TP +.B \-a +Use xml-stylesheet PI, not the +.I stylesheet +argument. +.TP +.B \-e\ \fIencoding +Force the specified encoding for the output. +.TP +.B \-i\ \fIinteger +Indent the specified amount. +.TP +.B \-m +Omit the +.B META +tag in HTML output. +.TP +.B \-o\ \fIfilename +Write output to the specified file. +.TP +.B \-p\ \fIname\ expression +Sets a stylesheet parameter. +.TP +.B \-t +Display timing information. +.TP +.B \-u +Disable escaping of URLs in HTML output. +.TP +.B \-? +Display a help message. +.TP +.B \-v +Validates source documents. diff --git a/xalan-c.spec b/xalan-c.spec index 8e88e97..f37370d 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -23,6 +23,8 @@ URL: https://apache.github.io/xalan-c/ Source0: %{releaseurl}/%{tar_name}.tar.gz Source1: %{releaseurl}/%{tar_name}.tar.gz.asc Source2: %{releaseurl}/KEYS +# Man page hand-written for Fedora in groff_man(7) format based on Xalan -? +Source3: Xalan.1 BuildRequires: gnupg2 BuildRequires: cmake @@ -124,6 +126,8 @@ install -t '%{buildroot}%{_docdir}/%{name}-doc' -D -p -m 0644 \ cp -rvp docs/images/ samples/ '%{buildroot}%{_docdir}/%{name}-doc' hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' +install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE3}' + %check %ctest @@ -131,6 +135,7 @@ hardlink -c -v '%{buildroot}%{_docdir}/%{name}-doc' %files %{_bindir}/Xalan +%{_mandir}/man1/Xalan.1* %files libs From 3ee7711344077c98bbcdf05f2c517965251ef8f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:40:58 +0000 Subject: [PATCH 25/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6952d6f21d3319348cf592093db9581aed7f51a9 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Fri, 18 Oct 2024 14:08:38 +0100 Subject: [PATCH 26/37] Rebuild for xerces-c 3.3 From 12a0a5d16d40f9b9d3f2aab918b1c6416039786d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 3 Nov 2024 07:05:29 -0500 Subject: [PATCH 27/37] Invoke %cmake in %conf rather than in %build --- xalan-c.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xalan-c.spec b/xalan-c.spec index f37370d..0c9e35f 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -108,8 +108,11 @@ find docs samples src -type f -exec file '{}' '+' | xargs dos2unix --keepdate -%build +%conf %cmake %{?with_icu:-Dtranscoder=icu} -GNinja + + +%build %cmake_build From 1ce79f1f2e5fc9a9aa5810f107ea3848abc0fd86 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 13 Dec 2024 14:14:24 -0500 Subject: [PATCH 28/37] Add a SourceLicense field --- xalan-c.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xalan-c.spec b/xalan-c.spec index 0c9e35f..193b364 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -15,6 +15,7 @@ Summary: Xalan XSLT processor for C/C++ # libtiff, but is a build-system file that does not contribute to the licenses # of the binary RPMs. License: Apache-2.0 +SourceLicense: %{license} AND libtiff URL: https://apache.github.io/xalan-c/ %global tag Xalan-C_%{gsub %{version} . _} %global tar_name xalan_c-%(echo %{version} | cut -d . -f -2) From 4feb6e480ae3641ae0bc6207f5e398fdf460d220 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 13 Dec 2024 13:55:13 -0500 Subject: [PATCH 29/37] Build as C++17 instead of C++14 - This is needed for ICU 75 compatibility; it fixes RHBZ#2332317. --- xalan-c-1.12-icu-75.patch | 15 +++++++++++++++ xalan-c.spec | 13 +++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 xalan-c-1.12-icu-75.patch diff --git a/xalan-c-1.12-icu-75.patch b/xalan-c-1.12-icu-75.patch new file mode 100644 index 0000000..0e27218 --- /dev/null +++ b/xalan-c-1.12-icu-75.patch @@ -0,0 +1,15 @@ +>= ICU 75 needs C++17, see https://bugs.gentoo.org/934471. +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,9 +32,9 @@ if (POLICY CMP0067) + cmake_policy(SET CMP0067 NEW) + endif(POLICY CMP0067) + +-# Try C++14, then fall back to C++11 and C++98. Used for feature tests ++# Try C++17, then fall back to C++14, then C++11, and C++98. Used for feature tests + # for optional features. +-set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD 17) + + # Use folders (for IDE project grouping) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/xalan-c.spec b/xalan-c.spec index 193b364..06aff3e 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -27,6 +27,19 @@ Source2: %{releaseurl}/KEYS # Man page hand-written for Fedora in groff_man(7) format based on Xalan -? Source3: Xalan.1 +# ICU 75 needs C++17 +# https://bugs.gentoo.org/934471 +# +# Fixes: +# +# [FTBFS] with icu-76.1 +# https://bugzilla.redhat.com/show_bug.cgi?id=2332317 +# +# Note that this patch is too trivial for there to be any need to associate a +# license with it; the patch merely adjusts the value of CMAKE_CXX_STANDARD +# from 14 to 17. +Patch: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/xalan-c/files/xalan-c-1.12-icu-75.patch + BuildRequires: gnupg2 BuildRequires: cmake # Either make or ninja is supported. From d75ac1f2c3e3892db48e29d28f140b3090485624 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:23:42 +0000 Subject: [PATCH 30/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 5146b0b2cd86d0380ff5ad881a3d70b5265b580a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:36:44 +0000 Subject: [PATCH 31/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0e6a5472ca0b07cb9442bb9b3548efd5f8eefb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:58:42 +0200 Subject: [PATCH 32/37] Rebuilt for icu 77.1 From d090728567c3d42625f8a1eac91f0add8d8c34e1 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 26 Nov 2025 10:17:49 +0100 Subject: [PATCH 33/37] Fix build with GCC 15. Patch taken from the Debian project. Signed-off-by: Marcin Juszkiewicz --- gcc_15_fixes.patch | 20 ++++++++++++++++++++ xalan-c.spec | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc_15_fixes.patch diff --git a/gcc_15_fixes.patch b/gcc_15_fixes.patch new file mode 100644 index 0000000..0d954b0 --- /dev/null +++ b/gcc_15_fixes.patch @@ -0,0 +1,20 @@ +Index: xalan/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp +=================================================================== +--- xalan.orig/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp 2025-10-22 08:05:45.403631397 -0400 ++++ xalan/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp 2025-10-22 08:18:14.821542155 -0400 +@@ -320,13 +320,13 @@ + { + XalanUnicodeChar value = decodeUTF16SurrogatePair(ch, theChars[i+1], getMemoryManager()); + +- if (this->m_isPresentable(value)) ++ if (m_predicate(value)) + { + write(value); + } + else + { +- this->writeNumberedEntityReference(value); ++ writeNumericCharacterReference(value); + } + + ++i; diff --git a/xalan-c.spec b/xalan-c.spec index 06aff3e..0d3632e 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -40,6 +40,8 @@ Source3: Xalan.1 # from 14 to 17. Patch: https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/xalan-c/files/xalan-c-1.12-icu-75.patch +Patch: gcc_15_fixes.patch + BuildRequires: gnupg2 BuildRequires: cmake # Either make or ninja is supported. @@ -104,7 +106,7 @@ documentation. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -n %{tar_name} +%autosetup -n %{tar_name} -p 1 # https://github.com/apache/xalan-c/pull/35 chmod -v a-x NOTICE From 4a34ca4c7b23b715a1afa1633f8e931044737e33 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:26:25 +0000 Subject: [PATCH 34/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 69abae99b713794a6686901d50e9cce9aefe7e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Mon, 8 Jun 2026 09:53:33 +0200 Subject: [PATCH 35/37] Rebuilt for icu 78.3 From 4c6e69918839e87f1b2c0456e58de6f5b727b61d Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 12 Feb 2026 15:46:11 +0100 Subject: [PATCH 36/37] Allow to build with CMake 4.0 (rhbz#2381639) --- xalan-c.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xalan-c.spec b/xalan-c.spec index 0d3632e..5507f12 100644 --- a/xalan-c.spec +++ b/xalan-c.spec @@ -125,6 +125,7 @@ find docs samples src -type f -exec file '{}' '+' | %conf +export CMAKE_POLICY_VERSION_MINIMUM=3.5 %cmake %{?with_icu:-Dtranscoder=icu} -GNinja From aad66176c976255d0555e43f4947a42117111284 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:59:57 +0000 Subject: [PATCH 37/37] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild