From 05c54cd13650c83e61a4c5b21874272943126f61 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:36:36 +0100 Subject: [PATCH 01/11] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index b567cf8..966dc7d 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 9 +%global baserelease 10 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -352,6 +352,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1:3.5.3-10 +- Rebuilt for java-21-openjdk as system jdk + * Thu Feb 1 2024 Avi Kivity - 1:3.5.3-9 - Remove const specifiers in templates that are now flagged by gcc 14. From fb82f7e97f738553696184e2ef9e94de4b747604 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 2 Mar 2024 16:44:44 +0100 Subject: [PATCH 02/11] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index b567cf8..0fa03d7 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 9 +%global baserelease 10 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -352,6 +352,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Sat Mar 02 2024 Jiri Vanek - 1:3.5.3-10 +- Rebuilt for java-21-openjdk as system jdk + * Thu Feb 1 2024 Avi Kivity - 1:3.5.3-9 - Remove const specifiers in templates that are now flagged by gcc 14. From 028c81fa2366973be35003d16a39c982b35cd2c9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 16 Jul 2024 11:06:41 -0600 Subject: [PATCH 03/11] Minor spec file simplifications --- antlr3.spec | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index 966dc7d..b722eb6 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -4,7 +4,7 @@ %global baserelease 10 # This package needs itself to build. Use this to bootstrap on a new system. -%bcond_with bootstrap +%bcond bootstrap 0 # Component versions to use when bootstrapping %global antlr2_version 2.7.7 @@ -13,6 +13,8 @@ %global ST4ver2 4.0.8 %global stringtemplatever 3.2.1 +%global giturl https://github.com/antlr/antlr3 + Summary: ANother Tool for Language Recognition Name: antlr3 Epoch: 1 @@ -20,8 +22,9 @@ Version: %{antlr_version} Release: %{baserelease}%{?dist} License: BSD-3-Clause URL: https://www.antlr3.org/ +VCS: git:%{giturl}.git -Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}/%{name}-%{antlr_version}.tar.gz +Source0: %{giturl}/archive/%{antlr_version}/%{name}-%{antlr_version}.tar.gz Source1: http://www.antlr3.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip %if %{with bootstrap} # Get prebuilt versions to bootstrap @@ -42,24 +45,24 @@ Source15: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/ant Source16: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.pom %endif -Patch0: 0001-java8-fix.patch +Patch: 0001-java8-fix.patch # Generate OSGi metadata -Patch1: osgi-manifest.patch +Patch: osgi-manifest.patch # Increase the default conversion timeout to avoid build failures when complex # grammars are processed on slow architectures. Patch from Debian. -Patch2: 0002-conversion-timeout.patch +Patch: 0002-conversion-timeout.patch # Fix problems with the C template. Patch from Debian. -Patch3: 0003-fix-c-template.patch +Patch: 0003-fix-c-template.patch # Keep Token.EOF_TOKEN for backwards compatibility. Patch from Debian. -Patch4: 0004-eof-token.patch +Patch: 0004-eof-token.patch # Make parsers reproducible. Patch from Debian. -Patch5: 0005-reproducible-parsers.patch +Patch: 0005-reproducible-parsers.patch # Fix for C++20 -Patch6: 0006-antlr3memory.hpp-fix-for-C-20-mode.patch +Patch: 0006-antlr3memory.hpp-fix-for-C-20-mode.patch # Compile for target 1.8 to fix build with JDK 11 -Patch7: 0007-update-java-target.patch +Patch: 0007-update-java-target.patch # Fix source for tighter gcc template checks -Patch8: 0008-unconst-cyclicdfa-gcc-14.patch +Patch: 0008-unconst-cyclicdfa-gcc-14.patch BuildRequires: ant BuildRequires: make From a4338032af980da5d5aa3f934db8311af035e919 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:07:36 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index b722eb6..c6f755e 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 10 +%global baserelease 11 # This package needs itself to build. Use this to bootstrap on a new system. %bcond bootstrap 0 @@ -355,6 +355,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1:3.5.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1:3.5.3-10 - Rebuilt for java-21-openjdk as system jdk From 48f3dbfe1b628c14a4869f18801f44318bb036ad Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 13 Jan 2025 08:42:39 -0700 Subject: [PATCH 05/11] Clarify license of the tool subpackage - Move configuration actions to %conf --- antlr3.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/antlr3.spec b/antlr3.spec index c6f755e..9922060 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -94,6 +94,7 @@ descriptions containing actions in a variety of target languages. %package tool Summary: ANother Tool for Language Recognition +License: BSD-3-Clause AND Apache-2.0 BuildArch: noarch Provides: %{name} = %{epoch}:%{antlr_version}-%{release} Obsoletes: %{name} < %{epoch}:%{antlr_version}-%{release} @@ -201,6 +202,8 @@ C++ runtime support for ANTLR-generated parsers. %prep %autosetup -p1 -n antlr3-%{antlr_version} -a 1 + +%conf sed -i "s,\${buildNumber},`cat %{_sysconfdir}/fedora-release` `date`," tool/src/main/resources/org/antlr/antlr.properties # remove pre-built artifacts @@ -355,6 +358,10 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Mon Jan 13 2025 Jerry James - 1:3.5.3-11 +- Clarify license of the tool subpackage +- Move configuration actions to %%conf + * Wed Jul 17 2024 Fedora Release Engineering - 1:3.5.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 79c9a1d53d718f7fa6bbaaa7a4989246f7432f2d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:11:51 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 9922060..0f811c7 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 11 +%global baserelease 12 # This package needs itself to build. Use this to bootstrap on a new system. %bcond bootstrap 0 @@ -358,6 +358,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1:3.5.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 13 2025 Jerry James - 1:3.5.3-11 - Clarify license of the tool subpackage - Move configuration actions to %%conf From 4c8f11a746d8beaa5dd991ea43f4624616c10842 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:03:54 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 0f811c7..bcd79b1 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 12 +%global baserelease 13 # This package needs itself to build. Use this to bootstrap on a new system. %bcond bootstrap 0 @@ -358,6 +358,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1:3.5.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1:3.5.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 68f3f86693f431425e32331be9616100a5adb416 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 18:58:34 +0200 Subject: [PATCH 08/11] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- antlr3.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index bcd79b1..4dba31d 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 13 +%global baserelease 14 # This package needs itself to build. Use this to bootstrap on a new system. %bcond bootstrap 0 @@ -64,9 +64,9 @@ Patch: 0007-update-java-target.patch # Fix source for tighter gcc template checks Patch: 0008-unconst-cyclicdfa-gcc-14.patch -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: make -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 %if %{without bootstrap} BuildRequires: mvn(org.antlr:antlr) BuildRequires: mvn(org.antlr:antlr3-maven-plugin) @@ -358,6 +358,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Tue Jul 29 2025 jiri vanek - 1:3.5.3-14 +- Rebuilt for java-25-openjdk as preffered jdk + * Wed Jul 23 2025 Fedora Release Engineering - 1:3.5.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From aa8d9cbe55b8d06bead5c1ca0b863b399bd6d0db Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 23 Sep 2025 11:37:47 -0600 Subject: [PATCH 09/11] Remove build dependency on maven-enforcer-plugin --- antlr3.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index 4dba31d..a62a1df 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 14 +%global baserelease 15 # This package needs itself to build. Use this to bootstrap on a new system. %bcond bootstrap 0 @@ -74,7 +74,6 @@ BuildRequires: mvn(org.antlr:ST4) BuildRequires: mvn(org.antlr:stringtemplate) %endif BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) @@ -218,6 +217,7 @@ find -type f -a -name *.class -delete %pom_disable_module antlr-complete %pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin -r :maven-javadoc-plugin # workarounds bug in filtering (Mark invalid) @@ -358,6 +358,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Tue Sep 23 2025 Jerry James - 1:3.5.3-15 +- Remove build dependency on maven-enforcer-plugin + * Tue Jul 29 2025 jiri vanek - 1:3.5.3-14 - Rebuilt for java-25-openjdk as preffered jdk From d10dab4fe2bf064579fe93a773c7851b8f2b674e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 9 Jan 2026 12:12:24 -0700 Subject: [PATCH 10/11] Reflow the description text --- antlr3.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index a62a1df..8ed0ec2 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -86,10 +86,10 @@ BuildRequires: libtool ExclusiveArch: %{java_arches} %description -ANother Tool for Language Recognition, is a language tool -that provides a framework for constructing recognizers, -interpreters, compilers, and translators from grammatical -descriptions containing actions in a variety of target languages. +ANother Tool for Language Recognition, is a language tool that provides a +framework for constructing recognizers, interpreters, compilers, and +translators from grammatical descriptions containing actions in a variety of +target languages. %package tool Summary: ANother Tool for Language Recognition @@ -103,10 +103,10 @@ Requires: %{name}-java = %{epoch}:%{antlr_version}-%{release} Requires: javapackages-tools %description tool -ANother Tool for Language Recognition, is a language tool -that provides a framework for constructing recognizers, -interpreters, compilers, and translators from grammatical -descriptions containing actions in a variety of target languages. +ANother Tool for Language Recognition, is a language tool that provides a +framework for constructing recognizers, interpreters, compilers, and +translators from grammatical descriptions containing actions in a variety of +target languages. %package java Summary: Java run-time support for ANTLR-generated parsers @@ -189,9 +189,9 @@ Version: %{c_runtime_version} Release: %{antlr_version}.%{baserelease}%{?dist} %description C-docs -This package contains doxygen documentation with instruction -on how to use the C target in ANTLR and complete API description of the -C run-time support for ANTLR-generated parsers. +This package contains doxygen documentation with instruction on how to use the +C target in ANTLR and complete API description of the C run-time support for +ANTLR-generated parsers. %package C++-devel Summary: C++ runtime support for ANTLR-generated parsers From db55f1e6d779f063581afc4e7ec7962edaafbd96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:45:07 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 8ed0ec2..6837262 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 15 +%global baserelease 16 # This package needs itself to build. Use this to bootstrap on a new system. %bcond bootstrap 0 @@ -358,6 +358,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1:3.5.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Sep 23 2025 Jerry James - 1:3.5.3-15 - Remove build dependency on maven-enforcer-plugin