From 883988aaa435134ce28e318bb73a933adea3bbef61fcef9e3d6030e87425a995 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 15 May 2018 06:05:28 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=53 --- antlr-bootstrap.changes | 6 ++++++ antlr-bootstrap.spec | 4 ++-- antlr.changes | 6 ++++++ antlr.spec | 8 ++++---- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/antlr-bootstrap.changes b/antlr-bootstrap.changes index ab9b098..679eb87 100644 --- a/antlr-bootstrap.changes +++ b/antlr-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 15 05:55:58 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 + ------------------------------------------------------------------- Thu Dec 7 11:38:17 UTC 2017 - dimstar@opensuse.org diff --git a/antlr-bootstrap.spec b/antlr-bootstrap.spec index 65831fe..8722776 100644 --- a/antlr-bootstrap.spec +++ b/antlr-bootstrap.spec @@ -27,7 +27,7 @@ Group: Development/Libraries/Java Url: http://www.antlr.org Source0: antlr-%{version}.tar.bz2 Source1: manifest.antlr -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: unzip BuildRequires: zip BuildArch: noarch @@ -94,7 +94,7 @@ function mkJar() { xargs jar cfm ${1}.jar manifest.* ; mv ${1}.jar $TARGET_DIR } -COMPILER_COMMAND="javac -source 1.6 -target 1.6 -cp " +COMPILER_COMMAND="javac -source 8 -target 8 -cp " delBinaryFiles mkdir src mv antlr src diff --git a/antlr.changes b/antlr.changes index 15773d1..85a475a 100644 --- a/antlr.changes +++ b/antlr.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 15 05:54:51 UTC 2018 - fstrba@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility in OpenJDK 11 + ------------------------------------------------------------------- Fri Jan 12 11:53:47 UTC 2018 - tchvatal@suse.com diff --git a/antlr.spec b/antlr.spec index 9427c9d..99c595d 100644 --- a/antlr.spec +++ b/antlr.spec @@ -21,7 +21,7 @@ Name: antlr Version: 2.7.7 Release: 0 Summary: Another Tool for Language Recognition -License: GPL-2.0+ AND SUSE-Public-Domain AND MIT +License: GPL-2.0-or-later AND SUSE-Public-Domain AND MIT Group: Development/Tools/Other Url: http://www.antlr.org/ Source0: antlr-%{version}.tar.bz2 @@ -35,7 +35,7 @@ Patch2: fix-docpath.diff BuildRequires: ant BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools %if %{with python2} BuildRequires: python2-base @@ -55,7 +55,7 @@ or Java actions (you can use PCCTS 1.xx to generate C-based parsers). %package java Summary: ANother Tool for Language Recognition (Manual) Group: Development/Tools/Other -Requires: java >= 1.6 +Requires: java >= 1.8 BuildArch: noarch %description java @@ -123,7 +123,7 @@ find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42 || : %build ant \ -Dj2se.apidoc=%{_javadocdir}/java \ - -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ jar %configure make -j1 From 0cc4cfa2fda8d7052d6db7d6aac1d075d4e8de1bb10247d6b2378cf2bfc0c483 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 19:51:20 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=54 --- antlr-bootstrap.changes | 2 +- antlr.changes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/antlr-bootstrap.changes b/antlr-bootstrap.changes index 679eb87..2f68097 100644 --- a/antlr-bootstrap.changes +++ b/antlr-bootstrap.changes @@ -2,7 +2,7 @@ Tue May 15 05:55:58 UTC 2018 - fstrba@suse.com - Build with source and target 8 to prepare for a possible removal - of 1.6 compatibility in OpenJDK 11 + of 1.6 compatibility ------------------------------------------------------------------- Thu Dec 7 11:38:17 UTC 2017 - dimstar@opensuse.org diff --git a/antlr.changes b/antlr.changes index 85a475a..b9149c0 100644 --- a/antlr.changes +++ b/antlr.changes @@ -2,7 +2,7 @@ Tue May 15 05:54:51 UTC 2018 - fstrba@suse.com - Build with source and target 8 to prepare for a possible removal - of 1.6 compatibility in OpenJDK 11 + of 1.6 compatibility ------------------------------------------------------------------- Fri Jan 12 11:53:47 UTC 2018 - tchvatal@suse.com From 88e4bc0106fcc0446366a789971699da90b51e9d6f09362ddb2462cc2eed2823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Jul 2018 15:28:10 +0000 Subject: [PATCH 3/4] - Do not use old compat macros for python directories OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=55 --- antlr.changes | 5 +++++ antlr.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/antlr.changes b/antlr.changes index b9149c0..001566b 100644 --- a/antlr.changes +++ b/antlr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 20 15:27:49 UTC 2018 - tchvatal@suse.com + +- Do not use old compat macros for python directories + ------------------------------------------------------------------- Tue May 15 05:54:51 UTC 2018 - fstrba@suse.com diff --git a/antlr.spec b/antlr.spec index 99c595d..0d582d5 100644 --- a/antlr.spec +++ b/antlr.spec @@ -147,11 +147,11 @@ install -m 0755 scripts/%{name}-config %{buildroot}%{_bindir}/ ### python runtime ### %if %{with python2} -install -d -m 0755 %{buildroot}%{py_sitedir}/%{name} -cp -a lib/python/antlr/* %{buildroot}%{py_sitedir}/%{name} +install -d -m 0755 %{buildroot}%{python_sitearch}/%{name} +cp -a lib/python/antlr/* %{buildroot}%{python_sitearch}/%{name} # compat symlink -ln -s -f %{py_sitedir}/%{name}/*.py %{buildroot}%{_datadir}/%{name}-%{version}/ -ln -s -f %{py_sitedir}/%{name}/*.pyc %{buildroot}%{_datadir}/%{name}-%{version}/ +ln -s -f %{python_sitearch}/%{name}/*.py %{buildroot}%{_datadir}/%{name}-%{version}/ +ln -s -f %{python_sitearch}/%{name}/*.pyc %{buildroot}%{_datadir}/%{name}-%{version}/ %endif ### cpp runtime ### @@ -189,7 +189,7 @@ find doc -type f | xargs chmod 0644 %dir %{_datadir}/%{name}-%{version} %{_datadir}/%{name}-%{version}/*py %{_datadir}/%{name}-%{version}/*pyc -%{py_sitedir}/%{name} +%{python_sitearch}/%{name} %endif %changelog From ddb639068775558e0d679923850432940bf2b32082b3dc2ded88753e90abec53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 20 Jul 2018 15:28:46 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=56 --- antlr-bootstrap.spec | 2 +- antlr.spec | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/antlr-bootstrap.spec b/antlr-bootstrap.spec index 8722776..6046d46 100644 --- a/antlr-bootstrap.spec +++ b/antlr-bootstrap.spec @@ -24,7 +24,7 @@ Release: 0 Summary: Antlr for bootstrapping purposes License: BSD-3-Clause AND SUSE-Public-Domain Group: Development/Libraries/Java -Url: http://www.antlr.org +URL: http://www.antlr.org Source0: antlr-%{version}.tar.bz2 Source1: manifest.antlr BuildRequires: java-devel >= 1.8 diff --git a/antlr.spec b/antlr.spec index 0d582d5..a7d0c67 100644 --- a/antlr.spec +++ b/antlr.spec @@ -23,7 +23,7 @@ Release: 0 Summary: Another Tool for Language Recognition License: GPL-2.0-or-later AND SUSE-Public-Domain AND MIT Group: Development/Tools/Other -Url: http://www.antlr.org/ +URL: http://www.antlr.org/ Source0: antlr-%{version}.tar.bz2 Source1: %{name}-build.xml Source2: %{name}-script @@ -37,14 +37,14 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools -%if %{with python2} -BuildRequires: python2-base -%endif BuildRequires: xml-commons-apis Requires: %{name}-java Provides: %{name}-bootstrap = %{version} Obsoletes: %{name}-bootstrap < %{version} Obsoletes: %{name}-javadoc +%if %{with python2} +BuildRequires: python2-base +%endif %description ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a @@ -167,7 +167,8 @@ find doc -type f | xargs chmod 0644 %fdupes -s doc %files -%doc LICENSE.txt README.txt CHANGES.txt +%license LICENSE.txt +%doc README.txt CHANGES.txt %dir %{_datadir}/%{name}-%{version} %{_bindir}/antlr %{_bindir}/antlr-config