From a68836f89536ff056e0e3bae7b5083dadc4428af6da510130bb114a1faa4358b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 13 Sep 2018 08:56:06 +0000 Subject: [PATCH 1/2] - Do not create compat symlink for python stuff as it was not working before anyway - Rename python package to python2-antlr (provide old symbol) OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=58 --- antlr.changes | 7 +++++++ antlr.spec | 10 ++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/antlr.changes b/antlr.changes index 001566b..0c40fc1 100644 --- a/antlr.changes +++ b/antlr.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 13 08:55:01 UTC 2018 - Tomáš Chvátal + +- Do not create compat symlink for python stuff as it was not working + before anyway +- Rename python package to python2-antlr (provide old symbol) + ------------------------------------------------------------------- Fri Jul 20 15:27:49 UTC 2018 - tchvatal@suse.com diff --git a/antlr.spec b/antlr.spec index a7d0c67..b7d3f31 100644 --- a/antlr.spec +++ b/antlr.spec @@ -93,12 +93,13 @@ or Java actions (you can use PCCTS 1.xx to generate C-based parsers). This package provides the C++ runtime (libantlr.a) and a headers files of antlr -%package -n python-%{name} +%package -n python2-%{name} Summary: ANother Tool for Language Recognition (python runtime) Group: Development/Tools/Other Requires: antlr +Provides: python-%{name} -%description -n python-%{name} +%description -n python2-%{name} Python support for generating your Lexers, Parsers and TreeParsers in Python. This feature extends the benefits of ANTLR's predicated-LL(k) parsing technology to the Python language and platform. @@ -149,9 +150,6 @@ install -m 0755 scripts/%{name}-config %{buildroot}%{_bindir}/ %if %{with python2} install -d -m 0755 %{buildroot}%{python_sitearch}/%{name} cp -a lib/python/antlr/* %{buildroot}%{python_sitearch}/%{name} -# compat symlink -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 ### @@ -186,7 +184,7 @@ find doc -type f | xargs chmod 0644 %{_includedir}/%{name} %if %{with python2} -%files -n python-%{name} +%files -n python2-%{name} %dir %{_datadir}/%{name}-%{version} %{_datadir}/%{name}-%{version}/*py %{_datadir}/%{name}-%{version}/*pyc From f81c02318792ca0a1a2b9f1002038e4caafcd68c731bcabdf0ca7f094d3f1479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 14 Sep 2018 12:55:33 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=59 --- antlr-bootstrap.spec | 2 +- antlr.spec | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/antlr-bootstrap.spec b/antlr-bootstrap.spec index 6046d46..4194151 100644 --- a/antlr-bootstrap.spec +++ b/antlr-bootstrap.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # diff --git a/antlr.spec b/antlr.spec index b7d3f31..c95e7e2 100644 --- a/antlr.spec +++ b/antlr.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -186,8 +186,6 @@ find doc -type f | xargs chmod 0644 %if %{with python2} %files -n python2-%{name} %dir %{_datadir}/%{name}-%{version} -%{_datadir}/%{name}-%{version}/*py -%{_datadir}/%{name}-%{version}/*pyc %{python_sitearch}/%{name} %endif