From 5cb7af52a21358cf843904781fbf09d2a39532c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:59:04 +0000 Subject: [PATCH 01/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 7096e6e..22fb2b1 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 22 +%global baserelease 23 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -276,6 +276,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1:3.5.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Apr 27 2019 Jerry James - 1:3.5.2-22 - Add Debian patches From d6b59940717e6a76bc3e48f610d29c604a2267a5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 1 Aug 2019 11:38:18 -0600 Subject: [PATCH 02/39] BR ant to fix FTBFS. Thanks to Fabio Valentini for the hint. --- antlr3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 22fb2b1..3dd2458 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 23 +%global baserelease 24 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -28,6 +28,7 @@ Patch4: 0004-eof-token.patch # Make parsers reproducible. Patch from Debian. Patch5: 0005-reproducible-parsers.patch +BuildRequires: ant BuildRequires: maven-local BuildRequires: mvn(org.antlr:antlr) BuildRequires: mvn(org.antlr:antlr3-maven-plugin) @@ -276,6 +277,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Thu Aug 1 2019 Jerry James - 1:3.5.2-24 +- BR ant to fix FTBFS. Thanks to Fabio Valentini for the hint. + * Wed Jul 24 2019 Fedora Release Engineering - 1:3.5.2-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 45fe0267c125e006e6707bac66b8581896d20843 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:39:52 +0000 Subject: [PATCH 03/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 3dd2458..a9869ff 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 24 +%global baserelease 25 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -277,6 +277,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1:3.5.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Aug 1 2019 Jerry James - 1:3.5.2-24 - BR ant to fix FTBFS. Thanks to Fabio Valentini for the hint. From e109a5d1095433de901701c63d64916ee861c2dc Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 25 Apr 2020 22:34:56 +0200 Subject: [PATCH 04/39] remove unnecessary dependency on deprecated parent pom --- antlr3.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index a9869ff..02ac73c 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 25 +%global baserelease 26 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -38,7 +38,6 @@ BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: autoconf @@ -149,6 +148,8 @@ sed -i "s,\${buildNumber},`cat %{_sysconfdir}/fedora-release` `date`," tool/src/ find -type f -a -name *.jar -delete find -type f -a -name *.class -delete +%pom_remove_parent + %pom_disable_module antlr3-maven-archetype %pom_disable_module gunit %pom_disable_module gunit-maven-plugin @@ -277,6 +278,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Sat Apr 25 2020 Fabio Valentini - 1:3.5.2-26 +- Remove unnecessary dependency on deprecated parent pom. + * Tue Jan 28 2020 Fedora Release Engineering - 1:3.5.2-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f1bb8d639678047935e1761c3bf3c1c7da8d0f1d Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 12 May 2020 15:15:18 +0300 Subject: [PATCH 05/39] Fix runtime support for C++20 mode (#1834782) --- 0006-antlr3memory.hpp-fix-for-C-20-mode.patch | 39 +++++++++++++++++++ antlr3.spec | 8 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 0006-antlr3memory.hpp-fix-for-C-20-mode.patch diff --git a/0006-antlr3memory.hpp-fix-for-C-20-mode.patch b/0006-antlr3memory.hpp-fix-for-C-20-mode.patch new file mode 100644 index 0000000..fd0870c --- /dev/null +++ b/0006-antlr3memory.hpp-fix-for-C-20-mode.patch @@ -0,0 +1,39 @@ +From 478902a7e57e2283c57410f5aa14939e743b5102 Mon Sep 17 00:00:00 2001 +From: Avi Kivity +Date: Tue, 12 May 2020 14:51:18 +0300 +Subject: [PATCH] antlr3memory.hpp: fix for C++20 mode + +gcc 10 in C++20 mode requires that the allocator type match +the type used to allocate, so do that by adding "const" to the +key type. +--- + runtime/Cpp/include/antlr3memory.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/runtime/Cpp/include/antlr3memory.hpp b/runtime/Cpp/include/antlr3memory.hpp +index 7713613..4667a00 100755 +--- a/runtime/Cpp/include/antlr3memory.hpp ++++ b/runtime/Cpp/include/antlr3memory.hpp +@@ -98,17 +98,17 @@ public: + { + }; + + template + class UnOrderedMapType : public std::map< KeyType, ValueType, std::less, +- AllocatorType > > ++ AllocatorType > > + { + }; + + template + class OrderedMapType : public std::map< KeyType, ValueType, std::less, +- AllocatorType > > ++ AllocatorType > > + { + }; + + ANTLR_INLINE static void* operator new (std::size_t bytes) + { +-- +2.26.2 + diff --git a/antlr3.spec b/antlr3.spec index 02ac73c..79b55bf 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 26 +%global baserelease 27 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -27,6 +27,8 @@ Patch3: 0003-fix-c-template.patch Patch4: 0004-eof-token.patch # Make parsers reproducible. Patch from Debian. Patch5: 0005-reproducible-parsers.patch +# Fix for C++20 +Patch6: 0006-antlr3memory.hpp-fix-for-C-20-mode.patch BuildRequires: ant BuildRequires: maven-local @@ -143,6 +145,7 @@ sed -i "s,\${buildNumber},`cat %{_sysconfdir}/fedora-release` `date`," tool/src/ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # remove pre-built artifacts find -type f -a -name *.jar -delete @@ -278,6 +281,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Tue May 12 2020 Avi Kivity - 1:3.5.2-27 +- Fix for C++20 mode (#1834782) + * Sat Apr 25 2020 Fabio Valentini - 1:3.5.2-26 - Remove unnecessary dependency on deprecated parent pom. From 05c26cb87081e84aa3103afa30f2f7003960bed4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 12 May 2020 08:38:57 -0600 Subject: [PATCH 06/39] Add 0007-update-java-target.patch to fix JDK 11 build. --- 0007-update-java-target.patch | 92 +++++++++++++++++++++++++++++++++++ antlr3.spec | 16 +++--- 2 files changed, 98 insertions(+), 10 deletions(-) create mode 100644 0007-update-java-target.patch diff --git a/0007-update-java-target.patch b/0007-update-java-target.patch new file mode 100644 index 0000000..37f3b6d --- /dev/null +++ b/0007-update-java-target.patch @@ -0,0 +1,92 @@ +--- a/antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml ++++ b/antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml +@@ -106,8 +106,8 @@ + maven-compiler-plugin + 2.0.2 + +- 1.6 +- jsr14 ++ 1.8 ++ 1.8 + src + + +--- a/pom.xml ++++ b/pom.xml +@@ -52,12 +52,10 @@ + --> + + UTF-8 +- ${env.JAVA5_HOME} +- ${env.JAVA6_HOME} +- ${java5.home}/lib/rt.jar +- ${java6.home}/lib/rt.jar +- ${bootclasspath.java5} +- ${bootclasspath.java6} ++ ${env.JAVA_HOME} ++ ${java.home}/lib/rt.jar ++ ${bootclasspath.java} ++ ${bootclasspath.java} + + + +@@ -145,8 +143,8 @@ + + default-compile + +- 1.5 +- 1.5 ++ 1.8 ++ 1.8 + + -Xlint + -Xlint:-serial +@@ -158,8 +156,8 @@ + + default-testCompile + +- 1.6 +- 1.6 ++ 1.8 ++ 1.8 + + -Xlint + -Xlint:-serial +@@ -235,15 +233,15 @@ + + default-compile + +- 1.5 +- 1.5 ++ 1.8 ++ 1.8 + + + + default-testCompile + +- 1.6 +- 1.6 ++ 1.8 ++ 1.8 + + + +@@ -290,6 +288,7 @@ + + 2.9.1 + ++ 8 + true + + +@@ -311,6 +310,9 @@ + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 ++ ++ 8 ++ + + + diff --git a/antlr3.spec b/antlr3.spec index 79b55bf..d656bee 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -15,7 +15,7 @@ Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}/%{n #Source2: http://www.antlr3.org/download/Python/antlr_python_runtime-%{python_runtime_version}.tar.gz Source3: http://www.antlr3.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip -Patch0: 0001-java8-fix.patch +Patch0: 0001-java8-fix.patch # Generate OSGi metadata Patch1: osgi-manifest.patch # Increase the default conversion timeout to avoid build failures when complex @@ -29,6 +29,8 @@ Patch4: 0004-eof-token.patch Patch5: 0005-reproducible-parsers.patch # Fix for C++20 Patch6: 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 BuildRequires: ant BuildRequires: maven-local @@ -161,15 +163,6 @@ find -type f -a -name *.class -delete %pom_remove_plugin :maven-source-plugin %pom_remove_plugin :maven-javadoc-plugin -# compile for target 1.6, see BZ#842572 -sed -i 's/jsr14/1.6/' antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml \ - antlr3-maven-plugin/pom.xml \ - gunit/pom.xml \ - gunit-maven-plugin/pom.xml \ - pom.xml \ - runtime/Java/pom.xml \ - tool/pom.xml - # workarounds bug in filtering (Mark invalid) %pom_xpath_remove pom:resource/pom:filtering @@ -281,6 +274,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Tue May 12 2020 Jerry James - 1:3.5.2-27 +- Add 0007-update-java-target.patch to fix JDK 11 build + * Tue May 12 2020 Avi Kivity - 1:3.5.2-27 - Fix for C++20 mode (#1834782) From 3da09e31273951145c002a6f4d36b787d09d37ad Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 3 Jun 2020 14:20:51 +0200 Subject: [PATCH 07/39] actually apply Patch7 --- antlr3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index d656bee..55c9425 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 27 +%global baserelease 28 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -148,6 +148,7 @@ sed -i "s,\${buildNumber},`cat %{_sysconfdir}/fedora-release` `date`," tool/src/ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # remove pre-built artifacts find -type f -a -name *.jar -delete @@ -274,6 +275,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jun 03 2020 Fabio Valentini - 1:3.5.2-28 +- Actually apply Patch7. + * Tue May 12 2020 Jerry James - 1:3.5.2-27 - Add 0007-update-java-target.patch to fix JDK 11 build From 317a12c99e2f66a1f73c7835367416c7136997c2 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 14:25:51 +0200 Subject: [PATCH 08/39] Rebuilt for JDK-11 --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 55c9425..ef10eac 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 28 +%global baserelease 29 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -275,6 +275,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Fri Jul 10 2020 Jiri Vanek - 1:3.5.2-29 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Wed Jun 03 2020 Fabio Valentini - 1:3.5.2-28 - Actually apply Patch7. From a7e125e70630a319bdc30c0f634d23bd59ba7e52 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 24 Jul 2020 17:11:53 -0600 Subject: [PATCH 09/39] Specify -source and -target for antlr-ant. --- antlr3.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index ef10eac..fdad4c1 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -196,7 +196,8 @@ popd # build ant task pushd antlr-ant/main/antlr3-task/ export CLASSPATH=$(build-classpath ant) -javac -encoding ISO-8859-1 antlr3-src/org/apache/tools/ant/antlr/ANTLR3.java +javac -encoding ISO-8859-1 -source 1.8 -target 1.8 \ + antlr3-src/org/apache/tools/ant/antlr/ANTLR3.java jar cvf ant-antlr3.jar \ -C antlr3-src org/apache/tools/ant/antlr/antlib.xml \ -C antlr3-src org/apache/tools/ant/antlr/ANTLR3.class From d13970fbdec3c0e3cc64a295196ffbff3c111d10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:07:13 +0000 Subject: [PATCH 10/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index fdad4c1..4f6f554 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 29 +%global baserelease 30 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -276,6 +276,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1:3.5.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 1:3.5.2-29 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 030c25413d154368ae97f26bfdaf398d3d220ec4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2020 10:51:36 -0700 Subject: [PATCH 11/39] Explicitly BR make. --- antlr3.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index 4f6f554..4dd4354 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -33,6 +33,7 @@ Patch6: 0006-antlr3memory.hpp-fix-for-C-20-mode.patch Patch7: 0007-update-java-target.patch BuildRequires: ant +BuildRequires: make BuildRequires: maven-local BuildRequires: mvn(org.antlr:antlr) BuildRequires: mvn(org.antlr:antlr3-maven-plugin) @@ -188,7 +189,7 @@ autoreconf -i %endif sed -i "s#CFLAGS = .*#CFLAGS = $RPM_OPT_FLAGS#" Makefile -make %{?_smp_mflags} +%make_build doxygen -u # update doxygen configuration file doxygen # build doxygen documentation popd @@ -221,7 +222,7 @@ EOF # install C runtime pushd runtime/C -make DESTDIR=$RPM_BUILD_ROOT install +%make_install rm $RPM_BUILD_ROOT%{_libdir}/libantlr3c.{a,la} pushd api/man/man3 for file in `ls -1 * | grep -vi "^antlr3"`; do From adfde4c0d38134de9cafe3b6effe4d0bb27ddf65 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:11:11 +0000 Subject: [PATCH 12/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 4dd4354..a938e3b 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 30 +%global baserelease 31 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -277,6 +277,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1:3.5.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1:3.5.2-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 2d77c1a4a83bd21a65102cf1067c0d763114baea Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 12 Mar 2021 11:22:29 -0700 Subject: [PATCH 13/39] Add bootstrap conditional (bz 1847093). --- antlr3.spec | 65 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index a938e3b..6c415d6 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,17 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 31 +%global baserelease 32 + +# This package needs itself to build. Use this to bootstrap on a new system. +%bcond_without bootstrap + +# Component versions to use when bootstrapping +%global antlr2_version 2.7.7 +%global bootstrap_version 3.5 +%global ST4ver1 4.0.7 +%global ST4ver2 4.0.8 +%global stringtemplatever 3.2.1 Summary: ANother Tool for Language Recognition Name: antlr3 @@ -12,8 +22,25 @@ License: BSD URL: http://www.antlr3.org/ Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}/%{name}-%{antlr_version}.tar.gz -#Source2: http://www.antlr3.org/download/Python/antlr_python_runtime-%{python_runtime_version}.tar.gz -Source3: http://www.antlr3.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip +Source1: http://www.antlr3.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip +%if %{with bootstrap} +# Get prebuilt versions to bootstrap +Source2: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.jar +Source3: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.pom +Source4: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.jar +Source5: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.pom +Source6: https://repo1.maven.org/maven2/org/antlr/antlr/%{bootstrap_version}/antlr-%{bootstrap_version}.jar +Source7: https://repo1.maven.org/maven2/org/antlr/antlr/%{bootstrap_version}/antlr-%{bootstrap_version}.pom +Source8: https://repo1.maven.org/maven2/org/antlr/antlr-master/%{bootstrap_version}/antlr-master-%{bootstrap_version}.pom +Source9: https://repo1.maven.org/maven2/org/antlr/antlr-runtime/%{bootstrap_version}/antlr-runtime-%{bootstrap_version}.jar +Source10: https://repo1.maven.org/maven2/org/antlr/antlr-runtime/%{bootstrap_version}/antlr-runtime-%{bootstrap_version}.pom +Source11: https://repo1.maven.org/maven2/org/antlr/antlr3-maven-plugin/%{bootstrap_version}/antlr3-maven-plugin-%{bootstrap_version}.jar +Source12: https://repo1.maven.org/maven2/org/antlr/antlr3-maven-plugin/%{bootstrap_version}/antlr3-maven-plugin-%{bootstrap_version}.pom +Source13: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{stringtemplatever}/stringtemplate-%{stringtemplatever}.jar +Source14: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{stringtemplatever}/stringtemplate-%{stringtemplatever}.pom +Source15: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.jar +Source16: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.pom +%endif Patch0: 0001-java8-fix.patch # Generate OSGi metadata @@ -35,10 +62,12 @@ Patch7: 0007-update-java-target.patch BuildRequires: ant BuildRequires: make BuildRequires: maven-local +%if %{without bootstrap} BuildRequires: mvn(org.antlr:antlr) BuildRequires: mvn(org.antlr:antlr3-maven-plugin) BuildRequires: mvn(org.antlr:ST4) BuildRequires: mvn(org.antlr:stringtemplate) +%endif BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-project) @@ -140,7 +169,7 @@ Summary: C++ runtime support for ANTLR-generated parsers C++ runtime support for ANTLR-generated parsers. %prep -%setup -q -n antlr3-%{antlr_version} -a 3 +%setup -q -n antlr3-%{antlr_version} -a 1 sed -i "s,\${buildNumber},`cat %{_sysconfdir}/fedora-release` `date`," tool/src/main/resources/org/antlr/antlr.properties %patch0 -p1 %patch1 @@ -175,6 +204,31 @@ find -type f -a -name *.class -delete %mvn_file :antlr-runtime antlr3-runtime %mvn_file :antlr-maven-plugin antlr3-maven-plugin +%if %{with bootstrap} +# Make the bootstrap JARs and POMs available +mkdir -p .m2/org/antlr/ST4/%{ST4ver1} +cp -p %{SOURCE2} %{SOURCE3} .m2/org/antlr/ST4/%{ST4ver1} +mkdir -p .m2/org/antlr/ST4/%{ST4ver2} +cp -p %{SOURCE4} %{SOURCE5} .m2/org/antlr/ST4/%{ST4ver2} +mkdir -p .m2/org/antlr/antlr/%{bootstrap_version} +cp -p %{SOURCE6} %{SOURCE7} .m2/org/antlr/antlr/%{bootstrap_version} +mkdir -p .m2/org/antlr/antlr-master/%{bootstrap_version} +cp -p %{SOURCE8} .m2/org/antlr/antlr-master/%{bootstrap_version} +mkdir -p .m2/org/antlr/antlr-runtime/%{bootstrap_version} +cp -p %{SOURCE9} %{SOURCE10} .m2/org/antlr/antlr-runtime/%{bootstrap_version} +mkdir -p .m2/org/antlr/antlr3-maven-plugin/%{bootstrap_version} +cp -p %{SOURCE11} %{SOURCE12} .m2/org/antlr/antlr3-maven-plugin/%{bootstrap_version} +mkdir -p .m2/org/antlr/stringtemplate/%{stringtemplatever} +cp -p %{SOURCE13} %{SOURCE14} .m2/org/antlr/stringtemplate/%{stringtemplatever} +mkdir -p .m2/antlr/antlr/%{antlr2_version} +cp -p %{SOURCE15} %{SOURCE16} .m2/antlr/antlr/%{antlr2_version} + +# We don't need the parent POM +%pom_remove_parent .m2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.pom +%pom_remove_parent .m2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.pom +%pom_remove_parent .m2/org/antlr/antlr-master/%{bootstrap_version}/antlr-master-%{bootstrap_version}.pom +%endif + %build %mvn_build -f @@ -277,6 +331,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Fri Mar 12 2021 Jerry James - 1:3.5.2-32 +- Add bootstrap conditional (bz 1847093) + * Tue Jan 26 2021 Fedora Release Engineering - 1:3.5.2-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 4786afe79c5cbd0104e0cd6ffb064b6d81579514 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 12 Mar 2021 11:26:46 -0700 Subject: [PATCH 14/39] Leave the bootstrap flag off now that I'm done testing it. --- antlr3.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 6c415d6..ffcd608 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -4,7 +4,7 @@ %global baserelease 32 # This package needs itself to build. Use this to bootstrap on a new system. -%bcond_without bootstrap +%bcond_with bootstrap # Component versions to use when bootstrapping %global antlr2_version 2.7.7 From 8e2e860a9564cbd87a91abeb8bd187ebb8f2f505 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:44:02 +0000 Subject: [PATCH 15/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7b7dcfbbf68f5dc27f3950fa1cde1ab3a04c4c76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:39:56 +0000 Subject: [PATCH 16/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index ffcd608..9ef0059 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 32 +%global baserelease 33 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -331,6 +331,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1:3.5.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Mar 12 2021 Jerry James - 1:3.5.2-32 - Add bootstrap conditional (bz 1847093) From 11742267008f1e7b8af290c9c1f9122c23348aba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:21:47 +0000 Subject: [PATCH 17/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 9ef0059..57908b6 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 33 +%global baserelease 34 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -331,6 +331,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1:3.5.2-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1:3.5.2-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 98e367464a221eaec7e0ff6a2074f0d0975795c2 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:17:22 +0100 Subject: [PATCH 18/39] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 57908b6..2626bcf 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ %global antlr_version 3.5.2 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 34 +%global baserelease 35 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -331,6 +331,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 1:3.5.2-35 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 1:3.5.2-34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 59d9ea161aa5ef251324952ab8694405b7df927b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 10 Apr 2022 20:18:28 -0600 Subject: [PATCH 19/39] Version 3.5.3. - Drop ancient obsoletes. - Minor spec file cleanups. --- 0007-update-java-target.patch | 79 ----------------- antlr3.spec | 155 ++++++++++++++++------------------ osgi-manifest.patch | 61 +++++++------ sources | 2 +- 4 files changed, 111 insertions(+), 186 deletions(-) diff --git a/0007-update-java-target.patch b/0007-update-java-target.patch index 37f3b6d..b2a8b56 100644 --- a/0007-update-java-target.patch +++ b/0007-update-java-target.patch @@ -11,82 +11,3 @@ src ---- a/pom.xml -+++ b/pom.xml -@@ -52,12 +52,10 @@ - --> - - UTF-8 -- ${env.JAVA5_HOME} -- ${env.JAVA6_HOME} -- ${java5.home}/lib/rt.jar -- ${java6.home}/lib/rt.jar -- ${bootclasspath.java5} -- ${bootclasspath.java6} -+ ${env.JAVA_HOME} -+ ${java.home}/lib/rt.jar -+ ${bootclasspath.java} -+ ${bootclasspath.java} - - - -@@ -145,8 +143,8 @@ - - default-compile - -- 1.5 -- 1.5 -+ 1.8 -+ 1.8 - - -Xlint - -Xlint:-serial -@@ -158,8 +156,8 @@ - - default-testCompile - -- 1.6 -- 1.6 -+ 1.8 -+ 1.8 - - -Xlint - -Xlint:-serial -@@ -235,15 +233,15 @@ - - default-compile - -- 1.5 -- 1.5 -+ 1.8 -+ 1.8 - - - - default-testCompile - -- 1.6 -- 1.6 -+ 1.8 -+ 1.8 - - - -@@ -290,6 +288,7 @@ - - 2.9.1 - -+ 8 - true - - -@@ -311,6 +310,9 @@ - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 -+ -+ 8 -+ - - - diff --git a/antlr3.spec b/antlr3.spec index 2626bcf..13e2787 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -1,7 +1,7 @@ -%global antlr_version 3.5.2 +%global antlr_version 3.5.3 %global c_runtime_version 3.4 %global javascript_runtime_version 3.1 -%global baserelease 35 +%global baserelease 1 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -13,33 +13,33 @@ %global ST4ver2 4.0.8 %global stringtemplatever 3.2.1 -Summary: ANother Tool for Language Recognition -Name: antlr3 -Epoch: 1 -Version: %{antlr_version} -Release: %{baserelease}%{?dist} -License: BSD -URL: http://www.antlr3.org/ +Summary: ANother Tool for Language Recognition +Name: antlr3 +Epoch: 1 +Version: %{antlr_version} +Release: %{baserelease}%{?dist} +License: BSD +URL: http://www.antlr3.org/ -Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}/%{name}-%{antlr_version}.tar.gz -Source1: http://www.antlr3.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip +Source0: https://github.com/antlr/antlr3/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 -Source2: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.jar -Source3: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.pom -Source4: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.jar -Source5: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.pom -Source6: https://repo1.maven.org/maven2/org/antlr/antlr/%{bootstrap_version}/antlr-%{bootstrap_version}.jar -Source7: https://repo1.maven.org/maven2/org/antlr/antlr/%{bootstrap_version}/antlr-%{bootstrap_version}.pom -Source8: https://repo1.maven.org/maven2/org/antlr/antlr-master/%{bootstrap_version}/antlr-master-%{bootstrap_version}.pom -Source9: https://repo1.maven.org/maven2/org/antlr/antlr-runtime/%{bootstrap_version}/antlr-runtime-%{bootstrap_version}.jar -Source10: https://repo1.maven.org/maven2/org/antlr/antlr-runtime/%{bootstrap_version}/antlr-runtime-%{bootstrap_version}.pom -Source11: https://repo1.maven.org/maven2/org/antlr/antlr3-maven-plugin/%{bootstrap_version}/antlr3-maven-plugin-%{bootstrap_version}.jar -Source12: https://repo1.maven.org/maven2/org/antlr/antlr3-maven-plugin/%{bootstrap_version}/antlr3-maven-plugin-%{bootstrap_version}.pom -Source13: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{stringtemplatever}/stringtemplate-%{stringtemplatever}.jar -Source14: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{stringtemplatever}/stringtemplate-%{stringtemplatever}.pom -Source15: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.jar -Source16: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.pom +Source2: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.jar +Source3: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver1}/ST4-%{ST4ver1}.pom +Source4: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.jar +Source5: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver2}/ST4-%{ST4ver2}.pom +Source6: https://repo1.maven.org/maven2/org/antlr/antlr/%{bootstrap_version}/antlr-%{bootstrap_version}.jar +Source7: https://repo1.maven.org/maven2/org/antlr/antlr/%{bootstrap_version}/antlr-%{bootstrap_version}.pom +Source8: https://repo1.maven.org/maven2/org/antlr/antlr-master/%{bootstrap_version}/antlr-master-%{bootstrap_version}.pom +Source9: https://repo1.maven.org/maven2/org/antlr/antlr-runtime/%{bootstrap_version}/antlr-runtime-%{bootstrap_version}.jar +Source10: https://repo1.maven.org/maven2/org/antlr/antlr-runtime/%{bootstrap_version}/antlr-runtime-%{bootstrap_version}.pom +Source11: https://repo1.maven.org/maven2/org/antlr/antlr3-maven-plugin/%{bootstrap_version}/antlr3-maven-plugin-%{bootstrap_version}.jar +Source12: https://repo1.maven.org/maven2/org/antlr/antlr3-maven-plugin/%{bootstrap_version}/antlr3-maven-plugin-%{bootstrap_version}.pom +Source13: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{stringtemplatever}/stringtemplate-%{stringtemplatever}.jar +Source14: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{stringtemplatever}/stringtemplate-%{stringtemplatever}.pom +Source15: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.jar +Source16: https://repo1.maven.org/maven2/antlr/antlr/%{antlr2_version}/antlr-%{antlr2_version}.pom %endif Patch0: 0001-java8-fix.patch @@ -69,17 +69,15 @@ 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.apache.maven:maven-project) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool - -# we don't build it now -Obsoletes: antlr3-gunit < 3.2-15 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool %description ANother Tool for Language Recognition, is a language tool @@ -87,65 +85,61 @@ 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 -BuildArch: noarch -Provides: %{name} = %{epoch}:%{antlr_version}-%{release} -Obsoletes: %{name} < %{epoch}:%{antlr_version}-%{release} -Requires: %{name}-java = %{epoch}:%{antlr_version}-%{release} +%package tool +Summary: ANother Tool for Language Recognition +BuildArch: noarch +Provides: %{name} = %{epoch}:%{antlr_version}-%{release} +Obsoletes: %{name} < %{epoch}:%{antlr_version}-%{release} +Requires: %{name}-java = %{epoch}:%{antlr_version}-%{release} # Explicit requires for javapackages-tools since antlr3-script # uses /usr/share/java-utils/java-functions -Requires: javapackages-tools +Requires: javapackages-tools - -Provides: ant-antlr3 = %{epoch}:%{antlr_version}-%{release} -Obsoletes: ant-antlr3 < %{epoch}:%{antlr_version}-%{release} - -%description tool +%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. -%package java -Summary: Java run-time support for ANTLR-generated parsers -BuildArch: noarch +%package java +Summary: Java run-time support for ANTLR-generated parsers +BuildArch: noarch -%description java +%description java Java run-time support for ANTLR-generated parsers -%package javadoc +%package javadoc Summary: API documentation for %{name} BuildArch: noarch -%description javadoc +%description javadoc %{summary}. -%package javascript -Summary: Javascript run-time support for ANTLR-generated parsers -Version: %{javascript_runtime_version} -Release: %{antlr_version}.%{baserelease}%{?dist} -BuildArch: noarch +%package javascript +Summary: Javascript run-time support for ANTLR-generated parsers +Version: %{javascript_runtime_version} +Release: %{antlr_version}.%{baserelease}%{?dist} +BuildArch: noarch -%description javascript +%description javascript Javascript run-time support for ANTLR-generated parsers -%package C -Summary: C run-time support for ANTLR-generated parsers -Version: %{c_runtime_version} -Release: %{antlr_version}.%{baserelease}%{?dist} +%package C +Summary: C run-time support for ANTLR-generated parsers +Version: %{c_runtime_version} +Release: %{antlr_version}.%{baserelease}%{?dist} -%description C +%description C C run-time support for ANTLR-generated parsers -%package C-devel -Summary: Header files for the C bindings for ANTLR-generated parsers -Requires: %{name}-C = %{epoch}:%{c_runtime_version}-%{release} -Version: %{c_runtime_version} -Release: %{antlr_version}.%{baserelease}%{?dist} +%package C-devel +Summary: Header files for the C bindings for ANTLR-generated parsers +Requires: %{name}-C = %{epoch}:%{c_runtime_version}-%{release} +Version: %{c_runtime_version} +Release: %{antlr_version}.%{baserelease}%{?dist} -%description C-devel +%description C-devel Header files for the C bindings for ANTLR-generated parsers %package C-docs @@ -154,31 +148,23 @@ BuildArch: noarch BuildRequires: graphviz BuildRequires: doxygen Requires: %{name}-C = %{epoch}:%{c_runtime_version}-%{release} -Version: %{c_runtime_version} -Release: %{antlr_version}.%{baserelease}%{?dist} +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. -%package C++-devel +%package C++-devel Summary: C++ runtime support for ANTLR-generated parsers -%description C++-devel +%description C++-devel C++ runtime support for ANTLR-generated parsers. %prep -%setup -q -n antlr3-%{antlr_version} -a 1 +%autosetup -p1 -n antlr3-%{antlr_version} -a 1 sed -i "s,\${buildNumber},`cat %{_sysconfdir}/fedora-release` `date`," tool/src/main/resources/org/antlr/antlr.properties -%patch0 -p1 -%patch1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 # remove pre-built artifacts find -type f -a -name *.jar -delete @@ -192,7 +178,7 @@ find -type f -a -name *.class -delete %pom_disable_module antlr-complete %pom_remove_plugin :maven-source-plugin -%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin -r :maven-javadoc-plugin # workarounds bug in filtering (Mark invalid) %pom_xpath_remove pom:resource/pom:filtering @@ -331,6 +317,11 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Sun Apr 10 2022 Jerry James - 1:3.5.3-1 +- Version 3.5.3 +- Drop ancient obsoletes +- Minor spec file cleanups + * Sat Feb 05 2022 Jiri Vanek - 1:3.5.2-35 - Rebuilt for java-17-openjdk as system jdk diff --git a/osgi-manifest.patch b/osgi-manifest.patch index 9c68224..ff9bceb 100644 --- a/osgi-manifest.patch +++ b/osgi-manifest.patch @@ -1,25 +1,38 @@ ---- runtime/Java/pom.xml.orig 2015-11-24 22:48:17.908747868 +0000 -+++ runtime/Java/pom.xml 2015-11-24 22:48:37.201489113 +0000 -@@ -64,4 +64,22 @@ - - - -+ -+ -+ -+ org.apache.felixmaven-bundle-plugin -+ bundle-manifestprocess-classesmanifest -+ -+ ${project.build.directory}/osgi -+ org.antlr.runtime!org.antlr.stringtemplate,* -+ -+ -+ -+ org.apache.maven.pluginsmaven-jar-plugin -+ -+ ${project.build.directory}/osgi/MANIFEST.MF -+ -+ -+ -+ +--- a/runtime/Java/pom.xml 2022-04-10 17:09:47.418531841 -0600 ++++ b/runtime/Java/pom.xml 2022-04-10 17:16:58.890381092 -0600 +@@ -81,6 +81,35 @@ + + + ++ ++ org.apache.felix ++ maven-bundle-plugin ++ ++ ++ bundle-manifest ++ process-classes ++ ++ manifest ++ ++ ++ ++ ++ ${project.build.directory}/osgi ++ ++ org.antlr.runtime ++ !org.antlr.stringtemplate,* ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-jar-plugin ++ ++ ++ ${project.build.directory}/osgi/MANIFEST.MF ++ ++ ++ + + diff --git a/sources b/sources index 22cdbe2..b2ec866 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (antlr3-3.5.2.tar.gz) = 796150c569320793614b9cab45f507e9e22947314c38eb8f8601823cd0e6fe1ac08f4433c7600d511bf822e46f5e8a21d193633192ae68f1bb64b8354eec250e +SHA512 (antlr3-3.5.3.tar.gz) = c565e1ade7a62bb127df707015afded9a9cea54cbf5488730a327671c57e8718f93f76c4fa28edd856810cb9c7ccbcb27b53a7c8f7e3efc8169e64cfcc535a4c SHA512 (antlr-javascript-runtime-3.1.zip) = 4bc7129d3eb1d864c05d91bf33d02f0fa03362ddb1b750157be04e5279891272d34b3fb18b421631b74dfafa48723e080b213a9acb993c6f17cec4c9e94f10ed From a3b806b253b27cf0e0ea938be40c65c25f55ca05 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 19 Jul 2022 16:33:32 -0600 Subject: [PATCH 20/39] Remove i686 support. See https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs. --- README.md | 6 ++++++ antlr3.spec | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..d572416 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# antlr3 + +[ANTLR version 3](https://www.antlr3.org/), 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. diff --git a/antlr3.spec b/antlr3.spec index 13e2787..273d647 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 1 +%global baserelease 2 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -19,7 +19,7 @@ Epoch: 1 Version: %{antlr_version} Release: %{baserelease}%{?dist} License: BSD -URL: http://www.antlr3.org/ +URL: https://www.antlr3.org/ Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}/%{name}-%{antlr_version}.tar.gz Source1: http://www.antlr3.org/download/antlr-javascript-runtime-%{javascript_runtime_version}.zip @@ -79,6 +79,9 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +# https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs +ExclusiveArch: %{java_arches} + %description ANother Tool for Language Recognition, is a language tool that provides a framework for constructing recognizers, @@ -317,6 +320,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Tue Jul 19 2022 Jerry James - 1:3.5.3-2 +- Remove i686 support (https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs) + * Sun Apr 10 2022 Jerry James - 1:3.5.3-1 - Version 3.5.3 - Drop ancient obsoletes From 6f1af7c9c070a90dac3d9008d70542f24e533b0c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:55:54 +0000 Subject: [PATCH 21/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 273d647..a28172f 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 2 +%global baserelease 3 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -320,6 +320,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1:3.5.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 19 2022 Jerry James - 1:3.5.3-2 - Remove i686 support (https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs) From 913904023080b63d8197f44a970377e48b949f2c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 11 Aug 2022 09:33:33 -0600 Subject: [PATCH 22/39] Convert License tag to SPDX. --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index a28172f..13e14db 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -18,7 +18,7 @@ Name: antlr3 Epoch: 1 Version: %{antlr_version} Release: %{baserelease}%{?dist} -License: BSD +License: BSD-3-Clause URL: https://www.antlr3.org/ Source0: https://github.com/antlr/antlr3/archive/%{antlr_version}/%{name}-%{antlr_version}.tar.gz @@ -320,6 +320,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Thu Aug 11 2022 Jerry James - 1:3.5.3-3%{?dist} +- Convert License tag to SPDX + * Wed Jul 20 2022 Fedora Release Engineering - 1:3.5.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 3f42420866a56d10e9c0c0ee57b799831e07b74a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 21 Nov 2022 15:47:11 -0700 Subject: [PATCH 23/39] Clarify license of the C-docs subpackage. --- antlr3.spec | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index 13e14db..a176e1f 100644 --- a/antlr3.spec +++ b/antlr3.spec @@ -146,6 +146,36 @@ Release: %{antlr_version}.%{baserelease}%{?dist} Header files for the C bindings for ANTLR-generated parsers %package C-docs +# The content is BSD-3-Clause. Other licenses are due to files installed by +# doxygen. +# api/bc_s.png: GPL-1.0-or-later +# api/bdwn.png: GPL-1.0-or-later +# api/closed.png: GPL-1.0-or-later +# api/doc.png: GPL-1.0-or-later +# api/doxygen.css: GPL-1.0-or-later +# api/doxygen.svg: GPL-1.0-or-later +# api/dynsections.js: MIT +# api/folderclosed.png: GPL-1.0-or-later +# api/folderopen.png: GPL-1.0-or-later +# api/jquery.js: MIT +# api/menu.js: MIT +# api/menudata.js: MIT +# api/nav_f.png: GPL-1.0-or-later +# api/nav_g.png: GPL-1.0-or-later +# api/nav_h.png: GPL-1.0-or-later +# api/navtree.css: GPL-1.0-or-later +# api/navtree.js: MIT +# api/open.png: GPL-1.0-or-later +# api/resize.js: MIT +# api/splitbar.png: GPL-1.0-or-later +# api/sync_off.png: GPL-1.0-or-later +# api/sync_on.png: GPL-1.0-or-later +# api/tab_a.png: GPL-1.0-or-later +# api/tab_b.png: GPL-1.0-or-later +# api/tab_h.png: GPL-1.0-or-later +# api/tab_s.png: GPL-1.0-or-later +# api/tabs.css: GPL-1.0-or-later +License: BSD-3-Clause AND GPL-1.0-or-later AND MIT Summary: API documentation for the C run-time support for ANTLR-generated parsers BuildArch: noarch BuildRequires: graphviz @@ -231,7 +261,7 @@ autoreconf -i %{nil} %endif -sed -i "s#CFLAGS = .*#CFLAGS = $RPM_OPT_FLAGS#" Makefile +sed -i 's#CFLAGS = .*#CFLAGS = %{build_cflags}#' Makefile %make_build doxygen -u # update doxygen configuration file doxygen # build doxygen documentation @@ -298,16 +328,17 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %{_libdir}/libantlr3c.so %files C-devel -%{_mandir}/man3/* -%{_includedir}/*.h +%{_mandir}/man3/ANTLR3* +%{_mandir}/man3/antlr3* +%{_includedir}/antlr3*.h %files C-docs %doc runtime/C/api %files C++-devel %doc tool/LICENSE.txt -%{_includedir}/*.hpp -%{_includedir}/*.inl +%{_includedir}/antlr3*.hpp +%{_includedir}/antlr3*.inl %files java -f .mfiles-java %doc tool/LICENSE.txt From 19abc93d019b34af6110a8626691f9a8d6ef179f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:51:02 +0000 Subject: [PATCH 24/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index a176e1f..8ecdf63 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 3 +%global baserelease 4 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -351,6 +351,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1:3.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Aug 11 2022 Jerry James - 1:3.5.3-3%{?dist} - Convert License tag to SPDX From 59ed7edb766b6dc5f72623da3ee1eee364c610fe Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 11 Jun 2023 09:03:24 -0600 Subject: [PATCH 25/39] Remove unneeded maven 2 dependency --- antlr3.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/antlr3.spec b/antlr3.spec index 8ecdf63..377dbcc 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 4 +%global baserelease 5 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -72,7 +72,6 @@ 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.apache.maven:maven-project) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-api) BuildRequires: autoconf @@ -351,10 +350,13 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Sun Jun 11 2023 Jerry James - 1:3.5.3-5 +- Remove unneeded maven 2 dependency + * Wed Jan 18 2023 Fedora Release Engineering - 1:3.5.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Thu Aug 11 2022 Jerry James - 1:3.5.3-3%{?dist} +* Thu Aug 11 2022 Jerry James - 1:3.5.3-3 - Convert License tag to SPDX * Wed Jul 20 2022 Fedora Release Engineering - 1:3.5.3-3 From b066801d83f885422df929fd837fb89750ae9526 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:24:56 +0000 Subject: [PATCH 26/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 377dbcc..71d37c2 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 5 +%global baserelease 6 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -350,6 +350,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1:3.5.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Jun 11 2023 Jerry James - 1:3.5.3-5 - Remove unneeded maven 2 dependency From 12f2deefdc5692d48ba1e147c778266d76a4ffd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:07:35 +0000 Subject: [PATCH 27/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index 71d37c2..ff4f880 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 6 +%global baserelease 7 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -350,6 +350,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1:3.5.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1:3.5.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 00ce207df4d4677a627041eb0d2e5dcfd81c2de4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:10:29 +0000 Subject: [PATCH 28/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- antlr3.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/antlr3.spec b/antlr3.spec index ff4f880..084bb08 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 7 +%global baserelease 8 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -350,6 +350,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1:3.5.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1:3.5.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e563d7d3f707d2653ee36a968b3e975a313f4aec Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Mon, 5 Feb 2024 18:06:10 +0200 Subject: [PATCH 29/39] Remove const specifiers from CyclicDFA members These const specifiers were ignored by older versions of gcc, likely because they are in template members that are not instantiated. gcc 14 refuses to compile the class. Fix by removing the const specifiers. This is safe since these members are private, so we aren't allowing external users permissions to modify them. --- 0008-unconst-cyclicdfa-gcc-14.patch | 29 +++++++++++++++++++++++++++++ antlr3.spec | 7 ++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0008-unconst-cyclicdfa-gcc-14.patch diff --git a/0008-unconst-cyclicdfa-gcc-14.patch b/0008-unconst-cyclicdfa-gcc-14.patch new file mode 100644 index 0000000..1a78820 --- /dev/null +++ b/0008-unconst-cyclicdfa-gcc-14.patch @@ -0,0 +1,29 @@ +--- a/runtime/Cpp/include/antlr3cyclicdfa.hpp.orig 2024-02-01 14:13:33.243312124 +0200 ++++ b/runtime/Cpp/include/antlr3cyclicdfa.hpp 2024-02-01 14:12:28.493542243 +0200 +@@ -61,18 +61,18 @@ + /// Decision number that a particular static structure + /// represents. + /// ++ ANTLR_INT32 m_decisionNumber; +- const ANTLR_INT32 m_decisionNumber; + + /// What this decision represents + /// + const ANTLR_UCHAR* m_description; ++ const ANTLR_INT32* m_eot; ++ const ANTLR_INT32* m_eof; ++ const ANTLR_INT32* m_min; ++ const ANTLR_INT32* m_max; ++ const ANTLR_INT32* m_accept; ++ const ANTLR_INT32* m_special; ++ const ANTLR_INT32* const * m_transition; +- const ANTLR_INT32* const m_eot; +- const ANTLR_INT32* const m_eof; +- const ANTLR_INT32* const m_min; +- const ANTLR_INT32* const m_max; +- const ANTLR_INT32* const m_accept; +- const ANTLR_INT32* const m_special; +- const ANTLR_INT32* const *const m_transition; + + public: + CyclicDFA( ANTLR_INT32 decisionNumber diff --git a/antlr3.spec b/antlr3.spec index 084bb08..b567cf8 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 8 +%global baserelease 9 # This package needs itself to build. Use this to bootstrap on a new system. %bcond_with bootstrap @@ -58,6 +58,8 @@ Patch5: 0005-reproducible-parsers.patch Patch6: 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 +# Fix source for tighter gcc template checks +Patch8: 0008-unconst-cyclicdfa-gcc-14.patch BuildRequires: ant BuildRequires: make @@ -350,6 +352,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/ %doc tool/LICENSE.txt %changelog +* Thu Feb 1 2024 Avi Kivity - 1:3.5.3-9 +- Remove const specifiers in templates that are now flagged by gcc 14. + * Mon Jan 22 2024 Fedora Release Engineering - 1:3.5.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 05c54cd13650c83e61a4c5b21874272943126f61 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:36:36 +0100 Subject: [PATCH 30/39] 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 028c81fa2366973be35003d16a39c982b35cd2c9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 16 Jul 2024 11:06:41 -0600 Subject: [PATCH 31/39] 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 32/39] 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 33/39] 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 34/39] 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 35/39] 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 36/39] 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 37/39] 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 38/39] 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 39/39] 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