Accepting request 653632 from Java:packages

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/653632
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=72

ant-antlr.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Let ant-antlr provide ant-xz too, since it contains the
+  corresponding jar. 
+
+-------------------------------------------------------------------
+Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Add aliases to some maven artifacts so that packages out there
+  resolve then correctly
+
 -------------------------------------------------------------------
 Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 

ant-antlr.spec

@@ -85,6 +85,7 @@ Provides:       ant-trax = %{version}
 Requires:       antlr
 %requires_eq    ant
 Provides:       ant-antlr = %{version}-%{release}
+Provides:       ant-xz = %{version}-%{release}
 Obsoletes:      ant-javadoc
 %endif
 %if %{with junit}
@@ -455,8 +456,13 @@ do
 
   #install pom
   install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
-  echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
+  if [ $jarname == ant-launcher ]; then
+    %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
+  elif [ $jarname == ant ]; then
+    %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
+  else
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar
+  fi
 done
 
 %if %{with bootstrap}

ant-junit.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Let ant-antlr provide ant-xz too, since it contains the
+  corresponding jar. 
+
+-------------------------------------------------------------------
+Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Add aliases to some maven artifacts so that packages out there
+  resolve then correctly
+
 -------------------------------------------------------------------
 Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 

ant-junit.spec

@@ -85,6 +85,7 @@ Provides:       ant-trax = %{version}
 Requires:       antlr
 %requires_eq    ant
 Provides:       ant-antlr = %{version}-%{release}
+Provides:       ant-xz = %{version}-%{release}
 Obsoletes:      ant-javadoc
 %endif
 %if %{with junit}
@@ -455,8 +456,13 @@ do
 
   #install pom
   install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
-  echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
+  if [ $jarname == ant-launcher ]; then
+    %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
+  elif [ $jarname == ant ]; then
+    %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
+  else
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar
+  fi
 done
 
 %if %{with bootstrap}

ant.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Let ant-antlr provide ant-xz too, since it contains the
+  corresponding jar. 
+
+-------------------------------------------------------------------
+Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Add aliases to some maven artifacts so that packages out there
+  resolve then correctly
+
 -------------------------------------------------------------------
 Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 

ant.spec

@@ -84,6 +84,7 @@ Provides:       ant-trax = %{version}
 Requires:       antlr
 %requires_eq    ant
 Provides:       ant-antlr = %{version}-%{release}
+Provides:       ant-xz = %{version}-%{release}
 Obsoletes:      ant-javadoc
 %endif
 %if %{with junit}
@@ -454,8 +455,13 @@ do
 
   #install pom
   install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
-  echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
+  if [ $jarname == ant-launcher ]; then
+    %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
+  elif [ $jarname == ant ]; then
+    %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
+  else
     %add_maven_depmap ${pomname} ${destname}${jarname}.jar
+  fi
 done
 
 %if %{with bootstrap}