From c4e270d1fac1c3b9073bee1bcaa7b5f31cabc1692f5bf5313e20f09627549ece Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 18 Dec 2018 08:53:10 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sonatype-oss-parent?expand=0&rev=2 --- sonatype-oss-parent.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sonatype-oss-parent.spec b/sonatype-oss-parent.spec index 392d89c..a7515f6 100644 --- a/sonatype-oss-parent.spec +++ b/sonatype-oss-parent.spec @@ -47,7 +47,13 @@ install -d -m 755 %{buildroot}%{_mavenpomdir} install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom %add_maven_depmap %{name}-%{version}.pom -%files -f .mfiles +%files %license LICENSE +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif %changelog From dddd94c69a339cac030e662d0a42529e669cb25410e48d2791dbe6d04f44c4eb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 5 Feb 2019 16:38:53 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sonatype-oss-parent?expand=0&rev=4 --- sonatype-oss-parent.spec | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sonatype-oss-parent.spec b/sonatype-oss-parent.spec index a7515f6..cb872b6 100644 --- a/sonatype-oss-parent.spec +++ b/sonatype-oss-parent.spec @@ -1,7 +1,7 @@ # # spec file for package sonatype-oss-parent # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -47,13 +47,7 @@ install -d -m 755 %{buildroot}%{_mavenpomdir} install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom %add_maven_depmap %{name}-%{version}.pom -%files +%files -f .mfiles %license LICENSE -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %changelog From 2e5a6fe588709c2e7d60e2165a6311cbcb91f5862194d29851da53616e196c5b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 6 Feb 2019 07:01:24 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sonatype-oss-parent?expand=0&rev=5 --- sonatype-oss-parent.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sonatype-oss-parent.spec b/sonatype-oss-parent.spec index cb872b6..f39c26b 100644 --- a/sonatype-oss-parent.spec +++ b/sonatype-oss-parent.spec @@ -43,9 +43,9 @@ cp -p %{SOURCE1} LICENSE %install # pom -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom -%add_maven_depmap %{name}-%{version}.pom +install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} +install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/oss-parent.pom +%add_maven_depmap %{name}/oss-parent.pom %files -f .mfiles %license LICENSE From 418084e2d46bb1b49ed55ba315e7142fae892286256b288989497550ab62644a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Feb 2019 08:30:41 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sonatype-oss-parent?expand=0&rev=6 --- sonatype-oss-parent.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sonatype-oss-parent.changes b/sonatype-oss-parent.changes index dd9d850..489bd44 100644 --- a/sonatype-oss-parent.changes +++ b/sonatype-oss-parent.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 7 08:30:03 UTC 2019 - Fridrich Strba + +- Clean-up the pom file installation to correspond to the standard + xmvn directories + ------------------------------------------------------------------- Tue Dec 18 07:54:00 UTC 2018 - Fridrich Strba