public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/antlr3] epel10: epel10 bootstrap, ST4 version
@ 2026-07-23 19:41 Kaleb S. KEITHLEY
0 siblings, 0 replies; 4+ messages in thread
From: Kaleb S. KEITHLEY @ 2026-07-23 19:41 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/antlr3
Branch : epel10
Commit : fb37cc74274d5e325770ac3279a838f0928e5c10
Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date : 2026-07-23T15:40:49-04:00
Stats : +5/-6 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/antlr3/c/fb37cc74274d5e325770ac3279a838f0928e5c10?branch=epel10
Log:
epel10 bootstrap, ST4 version
---
diff --git a/antlr3.spec b/antlr3.spec
index b8de198..e2c59ec 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -94,7 +94,7 @@ descriptions containing actions in a variety of target languages.
%package tool
Summary: ANother Tool for Language Recognition
-BuildArch: noarch
+BuildArch: noarch
Provides: %{name} = %{epoch}:%{antlr_version}-%{release}
Obsoletes: %{name} < %{epoch}:%{antlr_version}-%{release}
Requires: %{name}-java = %{epoch}:%{antlr_version}-%{release}
@@ -110,14 +110,14 @@ descriptions containing actions in a variety of target languages.
%package java
Summary: Java run-time support for ANTLR-generated parsers
-BuildArch: noarch
+BuildArch: noarch
%description java
Java run-time support for ANTLR-generated parsers
%package javadoc
Summary: API documentation for %{name}
-BuildArch: noarch
+BuildArch: noarch
%description javadoc
%{summary}.
@@ -126,7 +126,7 @@ BuildArch: noarch
Summary: Javascript run-time support for ANTLR-generated parsers
Version: %{javascript_runtime_version}
Release: %{antlr_version}.%{baserelease}%{?dist}
-BuildArch: noarch
+BuildArch: noarch
%description javascript
Javascript run-time support for ANTLR-generated parsers
@@ -181,8 +181,7 @@ Header files for the C bindings for ANTLR-generated parsers
# 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
-ExclusiveArch: %{java_arches} noarch
+BuildArch: noarch
BuildRequires: graphviz
BuildRequires: doxygen
Requires: %{name}-C = %{epoch}:%{c_runtime_version}-%{release}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [rpms/antlr3] epel10: epel10 bootstrap, ST4 version
@ 2026-07-24 0:11 Kaleb S. KEITHLEY
0 siblings, 0 replies; 4+ messages in thread
From: Kaleb S. KEITHLEY @ 2026-07-24 0:11 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/antlr3
Branch : epel10
Commit : 3b23d6e3bdd261a7ef4cfd8d06be42673c2d9d5b
Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date : 2026-07-23T20:10:37-04:00
Stats : +1/-0 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/antlr3/c/3b23d6e3bdd261a7ef4cfd8d06be42673c2d9d5b?branch=epel10
Log:
epel10 bootstrap, ST4 version
---
diff --git a/antlr3.spec b/antlr3.spec
index 1bd8517..464d500 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -228,6 +228,7 @@ find -type f -a -name *.class -delete
%mvn_file :antlr-maven-plugin antlr3-maven-plugin
%if %{with bootstrap}
%mvn_file :antlr ST4
+%mvn_file :antlr stringtemplate
%endif
%if %{with bootstrap}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [rpms/antlr3] epel10: epel10 bootstrap, ST4 version
@ 2026-07-23 23:59 Kaleb S. KEITHLEY
0 siblings, 0 replies; 4+ messages in thread
From: Kaleb S. KEITHLEY @ 2026-07-23 23:59 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/antlr3
Branch : epel10
Commit : e208396111bbf15358045417171b9a215a0a2c7a
Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date : 2026-07-23T19:59:02-04:00
Stats : +8/-1 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/antlr3/c/e208396111bbf15358045417171b9a215a0a2c7a?branch=epel10
Log:
epel10 bootstrap, ST4 version
---
diff --git a/antlr3.spec b/antlr3.spec
index e2c59ec..1bd8517 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_without bootstrap
@@ -226,6 +226,9 @@ find -type f -a -name *.class -delete
%mvn_file :antlr antlr3
%mvn_file :antlr-runtime antlr3-runtime
%mvn_file :antlr-maven-plugin antlr3-maven-plugin
+%if %{with bootstrap}
+%mvn_file :antlr ST4
+%endif
%if %{with bootstrap}
# Make the bootstrap JARs and POMs available
@@ -291,6 +294,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/antlr
%mvn_install
# install ant task
+ls -R
install -m 644 antlr-ant/main/antlr3-task/ant-antlr3.jar -D $RPM_BUILD_ROOT%{_javadir}/ant/ant-antlr3.jar
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
cat > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-antlr3 << EOF
@@ -358,6 +362,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/
%doc tool/LICENSE.txt
%changelog
+* Thu Jul 23 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:3.5.3-8
+- epel10 bootstrap, based on f39, ST4 bootstrap version
+
* Thu Jul 23 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:3.5.3-7
- epel10 bootstrap, based on f39, ST4 bootstrap version
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [rpms/antlr3] epel10: epel10 bootstrap, ST4 version
@ 2026-07-23 18:41 Kaleb S. KEITHLEY
0 siblings, 0 replies; 4+ messages in thread
From: Kaleb S. KEITHLEY @ 2026-07-23 18:41 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/antlr3
Branch : epel10
Commit : 3aa3658dcf4f8705b2fbba631a622727f54d4091
Author : Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date : 2026-07-23T14:41:10-04:00
Stats : +23/-20 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/antlr3/c/3aa3658dcf4f8705b2fbba631a622727f54d4091?branch=epel10
Log:
epel10 bootstrap, ST4 version
---
diff --git a/0008-ST4-version.patch b/0008-ST4-version.patch
new file mode 100644
index 0000000..be6f8e1
--- /dev/null
+++ b/0008-ST4-version.patch
@@ -0,0 +1,11 @@
+--- antlr3-3.5.3/pom.xml.orig 2026-07-23 14:17:58.913371922 -0400
++++ antlr3-3.5.3/pom.xml 2026-07-23 14:18:31.300515460 -0400
+@@ -58,7 +58,7 @@
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jdk>1.8</jdk>
+ <junit.version>4.13</junit.version>
+- <st4.version>4.3.1</st4.version>
++ <st4.version>4.0.8</st4.version>
+ <antlr.version>2.7.7</antlr.version>
+ <stringtemplate.version>3.2.1</stringtemplate.version>
+ <required-maven-version>3.3.1</required-maven-version>
diff --git a/antlr3.spec b/antlr3.spec
index 501459a..b8de198 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -11,7 +11,6 @@
%global bootstrap_version 3.5.2
%global ST4ver1 4.0.7
%global ST4ver2 4.0.8
-%global ST4ver3 4.3.1
%global stringtemplatever 3.2.1
Summary: ANother Tool for Language Recognition
@@ -41,28 +40,29 @@ Source13: https://repo1.maven.org/maven2/org/antlr/stringtemplate/%{string
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
-Source17: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver3}/ST4-%{ST4ver3}.jar
-Source18: https://repo1.maven.org/maven2/org/antlr/ST4/%{ST4ver3}/ST4-%{ST4ver3}.pom
Source19: https://repo1.maven.org/maven/maven-project/2.0/maven-project-2.0.jar
Source20: https://repo1.maven.org/maven/maven-project/2.0/maven-project-2.0.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
+
+# ST4 Version (bootstrap)
+Patch: 0008-ST4-version.patch
BuildRequires: ant
BuildRequires: make
@@ -227,9 +227,6 @@ find -type f -a -name *.class -delete
%mvn_file :antlr antlr3
%mvn_file :antlr-runtime antlr3-runtime
%mvn_file :antlr-maven-plugin antlr3-maven-plugin
-%if %{with bootstrap}
-%mvn_file :antlr-ST4-%{ST4ver3} antlr-ST4-%{ST4ver3}
-%endif
%if %{with bootstrap}
# Make the bootstrap JARs and POMs available
@@ -239,8 +236,6 @@ 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/ST4/%{ST4ver3}
-cp -p %{SOURCE17} %{SOURCE18} .m2/org/antlr/ST4/%{ST4ver3}
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}
@@ -258,7 +253,6 @@ cp -p %{SOURCE15} %{SOURCE16} .m2/antlr/antlr/%{antlr2_version}
%pom_remove_parent .m2/org/apache/maven/maven-project/2.0/maven-project-2.0.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/ST4/%{ST4ver3}/ST4-%{ST4ver3}.pom
%pom_remove_parent .m2/org/antlr/antlr-master/%{bootstrap_version}/antlr-master-%{bootstrap_version}.pom
%endif
@@ -366,7 +360,7 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/
%changelog
* Thu Jul 23 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:3.5.3-7
-- epel10 bootstrap, based on f39,
+- epel10 bootstrap, based on f39, ST4 bootstrap version
* Wed Jul 22 2026 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 1:3.5.3-6
- epel10 bootstrap, based on f39
diff --git a/sources b/sources
index e7e4da7..8a1c18c 100644
--- a/sources
+++ b/sources
@@ -7,7 +7,6 @@ SHA512 (antlr-runtime-3.5.2.jar) = 71adb4a78a23e4106e9f09c92a7e0c1d975ad314a49f4
SHA512 (maven-project-2.0.jar) = 9d24aa2c5bfd601abc285d3662d86bc93bbaacdd20461583c2f8f40ad5d01a2189f010ea571b71ef31b0fd6f5550de5fcea182f8fa0e4b104c1b305b99080dbf
SHA512 (ST4-4.0.7.jar) = a09f2a654011f92230d02ff8d34d054287795917d8a3497f58ce39c33f1f5f3ad5727e95c25d873c46bb88e9df5dda88dba977a7d70e73b4f85d70c7632eda6e
SHA512 (ST4-4.0.8.jar) = 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086
-SHA512 (ST4-4.3.1.jar) = f2dd1486ff64588969eaffefee1750c7bb00ccba7eb4366d733937239d5975f49b5936ac9b50c49864d5c55b30a95413153d0a163f4b0b3eee88e6bce67f0ce1
SHA512 (stringtemplate-3.2.1.jar) = 47f3cfd91906b527b615fd10d27387aafa9f355aa9c18a86861c975091c39895b711fe514ed1597dabe6af2a2705dfc45bb70fb5e30f5d428a48e0d1b02b7856
SHA512 (antlr-2.7.7.pom) = 4a34de18bee216852f43efddcd3bced1708548ebff7372b4ec4ecb6c289b36190b4d0d5588b86f9b65b3bc64756290b66bf1d6d9ed49d0cb8b972921829cba9e
SHA512 (antlr-3.5.2.pom) = 01b1b5be16ae8a60fe11bc9f9b183c259e146cc99fd465ec2a246ee3888a6dfbe4b305baa4f9d77185901fb6c2f34ab86f09a6e06fa3ae8ee982ae541c970d73
@@ -17,5 +16,4 @@ SHA512 (antlr-runtime-3.5.2.pom) = 39a38d7556b83924cec99bff215d63000ea312e090115
SHA512 (maven-project-2.0.pom) = cd677e3bf44244329fdafc095a6757c691707e387d591d0dad8231c9b2672fc8b41d44e73959adade283459d1a388f6ceb886ff8410effa495c2480e3d7a0a69
SHA512 (ST4-4.0.7.pom) = c7e1bcf1ad48ae49e45815c49bb2e6c94986f3da1916f8d85bedf4ca806b7e5337eb31be983e9dae277a1d01c0f8345d337a7b9b48877cad006b6bf4ed4129e5
SHA512 (ST4-4.0.8.pom) = 49f4d1e1a12aea70ba3813bd8cdbc38a2bdcb7bcac7473f183417cb047a54ff238e24f324dc5a01ea5b51009fc9ae1a1e947ad154989d4ff818c51437430eb9b
-SHA512 (ST4-4.3.1.pom) = b70ba80a00e0b7e3070e947b9e0f821bd16cd65802e3384eec9607f3289d3c33fc5c076578938f2a6f6dc139347d56a77d950db9d20d97f306b4fb9db036d662
SHA512 (stringtemplate-3.2.1.pom) = 947308bc06d81345eabb1515d936007b40d6c2170097cb5c660901660688c66b02879986a5377b7d997837afe87d779081a148bee80aab08f9692fb029e8d05b
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2026-07-24 0:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-23 19:41 [rpms/antlr3] epel10: epel10 bootstrap, ST4 version Kaleb S. KEITHLEY
-- strict thread matches above, loose matches on Subject: below --
2026-07-24 0:11 Kaleb S. KEITHLEY
2026-07-23 23:59 Kaleb S. KEITHLEY
2026-07-23 18:41 Kaleb S. KEITHLEY
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox