From 2cca62e76110ba1c6c31b6ad5be0403d6c1f11b3a5f35d60f51d11fe48c0155d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:05:15 +0000 Subject: [PATCH 1/3] Accepting request 1114349 from Java:packages:test simplify OBS-URL: https://build.opensuse.org/request/show/1114349 OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=78 --- antlr-bootstrap.spec | 3 +-- antlr.spec | 25 ++++++++----------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/antlr-bootstrap.spec b/antlr-bootstrap.spec index aa3025d..a5f407e 100644 --- a/antlr-bootstrap.spec +++ b/antlr-bootstrap.spec @@ -99,9 +99,8 @@ delBinaryFiles %install install -d -m 0755 %{buildroot}%{_javadir} install -m 0644 %{name}.jar %{buildroot}%{_javadir}/ -ln -s -f %{_javadir}/%{name}.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar %files -%{_javadir}/%{name}*.jar +%{_javadir}/%{name}.jar %changelog diff --git a/antlr.spec b/antlr.spec index aa61505..553c7a3 100644 --- a/antlr.spec +++ b/antlr.spec @@ -27,7 +27,7 @@ URL: https://www.antlr.org/ Source0: antlr-%{version}.tar.bz2 Source1: %{name}-build.xml Source2: %{name}-script -Source3: http://repo2.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom +Source3: https://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom Source1000: antlr-rpmlintrc Patch0: %{name}-jedit.patch Patch1: gcc45fix.diff @@ -35,7 +35,7 @@ Patch2: fix-docpath.diff BuildRequires: ant BuildRequires: gcc-c++ BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: xml-commons-apis Requires: %{name}-java Provides: %{name}-bootstrap = %{version} @@ -130,7 +130,7 @@ ant \ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ jar %configure --without-examples -make -j1 +%make_build -j1 %if %{with python2} %py_compile lib/python/antlr @@ -139,16 +139,14 @@ make -j1 %install ### jars ### install -d -m 0755 %{buildroot}%{_javadir} -cp -a work/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -s -f ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -# compat symlink +install -pm 0644 work/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar install -d -m 0755 %{buildroot}%{_datadir}/%{name}-%{version}/ -ln -s -f %{_javadir}/%{name}-%{version}.jar %{buildroot}%{_datadir}/%{name}-%{version}/%{name}.jar +ln -s -f %{_javadir}/%{name}.jar %{buildroot}%{_datadir}/%{name}-%{version}/%{name}.jar ### pom ### install -d -m 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom -%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar -a %{name}:%{name}all -f java +%{mvn_install_pom} %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom +%add_maven_depmap %{name}-%{version}.pom %{name}.jar -a %{name}:%{name}all -f java ### scripts ### install -d -m 0755 %{buildroot}%{_bindir}/ @@ -178,16 +176,9 @@ find doc -type f | xargs chmod 0644 %{_bindir}/antlr %{_bindir}/antlr-config -%files java +%files java -f .mfiles-java %dir %{_datadir}/%{name}-%{version} %{_datadir}/%{name}-%{version}/*jar -%{_javadir}/%{name}*.jar -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/%{name}-java -%else -%{_datadir}/maven-metadata/%{name}-java.xml -%endif %files manual %doc doc From 1549494232d2399e2389b1ef984ac3bf3689ad40db6ef5b0ebb41b8241a03165 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 15:57:05 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=79 --- antlr.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/antlr.spec b/antlr.spec index 553c7a3..bbaf572 100644 --- a/antlr.spec +++ b/antlr.spec @@ -16,6 +16,7 @@ # +%{!?make_build:%global make_build make %{?_smp_mflags}} %bcond_without python2 Name: antlr Version: 2.7.7 From 516416f833c4a4ccd33c84027f1dc00e3a0e83c2241168816cae25b91fd714b2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 17 Oct 2023 11:08:49 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr?expand=0&rev=80 --- antlr-bootstrap.changes | 5 +++++ antlr.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/antlr-bootstrap.changes b/antlr-bootstrap.changes index e89b158..632f04a 100644 --- a/antlr-bootstrap.changes +++ b/antlr-bootstrap.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 17 11:07:22 UTC 2023 - Fridrich Strba + +- Clean the spec file and use javapackages-local >= 6 features + ------------------------------------------------------------------- Thu May 4 12:54:42 UTC 2023 - Frederic Crozat diff --git a/antlr.changes b/antlr.changes index 1d5d055..3b4a2ac 100644 --- a/antlr.changes +++ b/antlr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 17 11:07:22 UTC 2023 - Fridrich Strba + +- Clean the spec file and use javapackages-local >= 6 features + ------------------------------------------------------------------- Thu May 4 12:54:42 UTC 2023 - Frederic Crozat