Accepting request 642712 from home:fstrba:branches:Java:packages

OBS-URL: https://build.opensuse.org/request/show/642712
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=117

ant-junit.spec

@@ -13,7 +13,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/
 #
 
 
@@ -29,7 +29,7 @@ Release:        0
 Summary:        Optional junit tasks for ant
 License:        Apache-2.0
 Group:          Development/Tools/Building
-Url:            http://ant.apache.org/
+URL:            http://ant.apache.org/
 Source0:        http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
 Source1:        apache-ant-1.8.ant.conf
 Source1000:     pre_checkin.sh
@@ -44,6 +44,7 @@ Patch6:         reproducible-build-date.patch
 Patch7:         ant-python3.patch
 BuildRequires:  antlr-bootstrap
 BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis-bootstrap
@@ -451,17 +452,15 @@ do
   [ $jarname == ant-bootstrap ] && continue
 
   #install pom
-%if !%{with bootstrap}
   install -m 644 src%{_sysconfdir}/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
   echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar"
   %add_maven_depmap ${pomname} ${destname}${jarname}.jar
-%endif
 done
 
 %if %{with bootstrap}
 #ant-parent pom
-#install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
-#%add_maven_depmap JPP-ant-parent.pom
+install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
+%add_maven_depmap JPP-ant-parent.pom
 
 # scripts: remove dos and os/2 scripts
 rm -f src/script/*.bat
@@ -532,11 +531,12 @@ find %{buildroot}%{_datadir}/ant%{_sysconfdir} -type f -name "*.xsl" \
                                                  -print -delete
 %endif
 # remove *.orig
-rm -rf %{buildroot}/usr/bin/ant.orig
+rm -rf %{buildroot}%{_bindir}/ant.orig
 
 %if %{with bootstrap}
 %files
-%doc KEYS LICENSE NOTICE README WHATSNEW
+%license LICENSE
+%doc KEYS NOTICE README WHATSNEW
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %attr(0755,root,root) %{_bindir}/ant
 %attr(0755,root,root) %{_bindir}/antRun
@@ -562,15 +562,15 @@ rm -rf %{buildroot}/usr/bin/ant.orig
 %{ant_home}/lib/ant-bootstrap.jar
 %{ant_home}/lib/ant-launcher.jar
 %dir %{_sysconfdir}/ant.d
-#%{_mavenpomdir}/JPP-ant-launcher.pom
-#%{_mavenpomdir}/JPP-ant-parent.pom
-#%{_mavenpomdir}/JPP-ant.pom
-#%if %{defined _maven_repository}
-#%config(noreplace) %{_mavendepmapfragdir}/ant
-#%else
-#%{_datadir}/maven-metadata/ant.xml
-#%endif
-#%dir %{_mavenpomdir}
+%{_mavenpomdir}/JPP-ant-launcher.pom
+%{_mavenpomdir}/JPP-ant-parent.pom
+%{_mavenpomdir}/JPP-ant.pom
+%if %{defined _maven_repository}
+%config(noreplace) %{_mavendepmapfragdir}/ant
+%else
+%{_datadir}/maven-metadata/ant.xml
+%endif
+%dir %{_mavenpomdir}
 
 %endif
 
@@ -611,14 +611,14 @@ rm -rf %{buildroot}/usr/bin/ant.orig
 %{_javadir}/ant/ant-jmf.jar
 %{ant_home}/lib/ant-jmf.jar
 %config(noreplace) %{_sysconfdir}/ant.d/jmf
-#%{_mavenpomdir}/JPP.ant-ant-jmf.pom
+%{_mavenpomdir}/JPP.ant-ant-jmf.pom
 
 %files -n ant-swing
 %{_javadir}/ant/ant-swing.jar
 %{ant_home}/lib/ant-swing.jar
 %config(noreplace) %{_sysconfdir}/ant.d/swing
-#%{_mavenpomdir}/JPP.ant-ant-swing.pom
-#%dir %{_mavenpomdir}
+%{_mavenpomdir}/JPP.ant-ant-swing.pom
+%dir %{_mavenpomdir}
 
 %files -n ant-scripts
 %defattr(0755,root,root,0755)