From 33def1831c1f789f19ec9d72c197ef77992b84070a6a846c5715f1f3690893e8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 30 Sep 2019 08:17:40 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=145 --- ant-antlr.spec | 4 +++- ant-junit.spec | 4 +++- ant-junit5.spec | 4 +++- ant.spec | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ant-antlr.spec b/ant-antlr.spec index c39e12b..2e1e026 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -483,7 +483,9 @@ do fi #install pom - %pom_remove_parent src/etc/poms/${jarname}/pom.xml + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} if [ "$jarname" = ant-launcher ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher diff --git a/ant-junit.spec b/ant-junit.spec index b18c46a..d7c7ff0 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -483,7 +483,9 @@ do fi #install pom - %pom_remove_parent src/etc/poms/${jarname}/pom.xml + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} if [ "$jarname" = ant-launcher ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher diff --git a/ant-junit5.spec b/ant-junit5.spec index 8c33c74..2342e88 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -483,7 +483,9 @@ do fi #install pom - %pom_remove_parent src/etc/poms/${jarname}/pom.xml + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} if [ "$jarname" = ant-launcher ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher diff --git a/ant.spec b/ant.spec index a1e8d33..936f945 100644 --- a/ant.spec +++ b/ant.spec @@ -482,7 +482,9 @@ do fi #install pom - %pom_remove_parent src/etc/poms/${jarname}/pom.xml + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} if [ "$jarname" = ant-launcher ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher