fix build of ant-antlr - the rest of ant's modules

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

ant.spec

@@ -472,9 +472,10 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t
 %patch1 -p1 -b .sav1
 %endif
 
-# Update ant to work with recent versions of GNU Classpath
 # When bootstrapping, we don't have junit
+%if %bootstrap
 %patch3 -p1
+%endif
 
 # Fix class-path-in-manifest rpmlint warning
 %patch4
@@ -536,7 +537,7 @@ install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
 for jar in build/lib/*.jar
 do
   jarname=$(basename $jar .jar)
-  pomname="JPP.%{name}-${jarname}.pom"
+  pomname="JPP.ant-${jarname}.pom"
 
   #Determine where to put it
   case $jarname in
@@ -551,6 +552,8 @@ do
 #Bootstracp builds an incomplete ant-junit, don't ship it
 %if %bootstrap
   ant-junit) continue;;
+%else
+  ant-jmf|ant-swing) continue;;
 %endif
 #These go into %%{_javadir}/ant
   *) destdir=%{buildroot}%{_javadir}/ant; destname="/ant";
@@ -604,6 +607,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d
 echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf
 echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing
 %else
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
 echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr
 echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf
 echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver
@@ -771,9 +775,7 @@ rm -rf %{buildroot}
 %files -n ant-apache-bcel
 %defattr(0644,root,root,0755)
 %{_javadir}/ant/ant-apache-bcel.jar
-%{_javadir}/ant/ant-jakarta-bcel.jar
 %{ant_home}/lib/ant-apache-bcel.jar
-%{ant_home}/lib/ant-jakarta-bcel.jar
 %config(noreplace) %{_sysconfdir}/ant.d/apache-bcel
 %{_datadir}/maven2/poms/JPP.ant-ant-apache-bcel.pom
 %dir %{_datadir}/maven2/
@@ -782,9 +784,7 @@ rm -rf %{buildroot}
 %files -n ant-apache-log4j
 %defattr(0644,root,root,0755)
 %{_javadir}/ant/ant-apache-log4j.jar
-%{_javadir}/ant/ant-jakarta-log4j.jar
 %{ant_home}/lib/ant-apache-log4j.jar
-%{ant_home}/lib/ant-jakarta-log4j.jar
 %config(noreplace) %{_sysconfdir}/ant.d/apache-log4j
 %{_datadir}/maven2/poms/JPP.ant-ant-apache-log4j.pom
 %dir %{_datadir}/maven2/
@@ -793,9 +793,10 @@ rm -rf %{buildroot}
 %files -n ant-apache-oro
 %defattr(0644,root,root,0755)
 %{_javadir}/ant/ant-apache-oro.jar
-%{_javadir}/ant/ant-jakarta-oro.jar
 %{ant_home}/lib/ant-apache-oro.jar
-%{ant_home}/lib/ant-jakarta-oro.jar
+%{ant_home}/etc/maudit-frames.xsl
+%config(noreplace) %{_sysconfdir}/ant.d/apache-oro
+%{_datadir}/maven2/poms/JPP.ant-ant-apache-oro.pom
 %dir %{_datadir}/maven2/
 %dir %{_datadir}/maven2/poms
 
@@ -803,7 +804,7 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_javadir}/ant/ant-apache-regexp.jar
 %{ant_home}/lib/ant-apache-regexp.jar
-%config(noreplace) %{_sysconfdir}/ant/apache-regexp
+%config(noreplace) %{_sysconfdir}/ant.d/apache-regexp
 %{_datadir}/maven2/poms/JPP.ant-ant-apache-regexp.pom
 %dir %{_datadir}/maven2/
 %dir %{_datadir}/maven2/poms
@@ -813,6 +814,7 @@ rm -rf %{buildroot}
 %{_javadir}/ant/ant-apache-xalan2.jar
 %{ant_home}/lib/ant-apache-xalan2.jar
 %config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2
+%{_datadir}/maven2/poms/JPP.ant-ant-apache-xalan2.pom
 
 %files -n ant-javamail
 %defattr(0644,root,root,0755)
@@ -859,6 +861,9 @@ rm -rf %{buildroot}
 %{_javadir}/ant/ant-testutil.jar
 %{ant_home}/lib/ant-testutil.jar
 %config(noreplace) %{_sysconfdir}/ant.d/testutil
+%{_datadir}/maven2/poms/JPP.ant-ant-testutil.pom
+%dir %{_datadir}/maven2/
+%dir %{_datadir}/maven2/poms
 
 %files -n ant-manual
 %defattr(0644,root,root,0755)
@@ -866,7 +871,7 @@ rm -rf %{buildroot}
 
 %files -n ant-javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/ant-%{version}
+%{_javadocdir}/ant
 %endif
 
 %changelog