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