From c19ddebd4a7beeff7d82b74bfe77e08ad6197985 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Fri, 7 Aug 2009 22:02:43 +0000
Subject: [PATCH] - Add links to jar files into %{ant_home} (Bug #179759)

---
 ant.spec | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/ant.spec b/ant.spec
index bd158a1..1a49c85 100644
--- a/ant.spec
+++ b/ant.spec
@@ -55,7 +55,7 @@
 
 Name:           ant
 Version:        1.7.1
-Release:        10.2%{?dist}
+Release:        11%{?dist}
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -654,8 +654,8 @@ install -m 644 %{SOURCE26} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-pa
 %endif
 
 # jar aliases
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do jarname=`echo $jar| sed "s|-%{version}||g"`; ln -sf ${jar} ${jarname}; ln -sf ../../java/${jarname} $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}; done)
+(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}.jar; do jarname=`echo $jar| sed "s|-%{version}||g"`; ln -sf ${jar} ${jarname}; ln -sf ../../java/%{name}/${jarname} $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}; done)
 
 # scripts: remove dos and os/2 scripts
 rm -f src/script/*.bat
@@ -1066,6 +1066,9 @@ fi
 %{ant_home}/etc/common2master.xsl
 %endif
 %dir %{ant_home}/lib
+%{ant_home}/lib/%{name}.jar
+%{ant_home}/lib/%{name}-launcher.jar
+%{ant_home}/lib/%{name}-bootstrap.jar
 %dir %{_sysconfdir}/%{name}.d
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}/*
@@ -1079,6 +1082,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jmf.jar
 %{_javadir}/%{name}/%{name}-jmf-%{version}.jar
+%{ant_home}/lib/%{name}-jmf.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jmf
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jmf-%{version}.jar.*
@@ -1088,6 +1092,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-nodeps.jar
 %{_javadir}/%{name}/%{name}-nodeps-%{version}.jar
+%{ant_home}/lib/%{name}-nodeps.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/nodeps
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-nodeps-%{version}.jar.*
@@ -1097,6 +1102,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-swing.jar
 %{_javadir}/%{name}/%{name}-swing-%{version}.jar
+%{ant_home}/lib/%{name}-swing.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/swing
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-swing-%{version}.jar.*
@@ -1106,6 +1112,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-trax.jar
 %{_javadir}/%{name}/%{name}-trax-%{version}.jar
+%{ant_home}/lib/%{name}-trax.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/trax
 %{ant_home}/etc/mmetrics-frames.xsl
 %{ant_home}/etc/coverage-frames.xsl
@@ -1139,6 +1146,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-antlr.jar
 %{_javadir}/%{name}/%{name}-antlr-%{version}.jar
+%{ant_home}/lib/%{name}-antlr.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/antlr
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-antlr-%{version}.jar.*
@@ -1148,6 +1156,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-bsf.jar
 %{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar
+%{ant_home}/lib/%{name}-apache-bsf.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bsf-%{version}.jar.*
@@ -1157,6 +1166,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-apache-resolver.jar
 %{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar
+%{ant_home}/lib/%{name}-apache-resolver.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-resolver-%{version}.jar.*
@@ -1166,6 +1176,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-commons-logging.jar
 %{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar
+%{ant_home}/lib/%{name}-commons-logging.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-logging-%{version}.jar.*
@@ -1175,6 +1186,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-commons-net.jar
 %{_javadir}/%{name}/%{name}-commons-net-%{version}.jar
+%{ant_home}/lib/%{name}-commons-net.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-commons-net-%{version}.jar.*
@@ -1186,6 +1198,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jai.jar
 %{_javadir}/%{name}/%{name}-jai-%{version}.jar
+%{ant_home}/lib/%{name}-jai.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jai
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jai-%{version}.jar.*
@@ -1197,6 +1210,7 @@ fi
 %{_javadir}/%{name}/%{name}-apache-bcel.jar
 %{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-bcel.jar
+%{ant_home}/lib/%{name}-apache-bcel.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-bcel-%{version}.jar.*
@@ -1207,6 +1221,7 @@ fi
 %{_javadir}/%{name}/%{name}-apache-log4j.jar
 %{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-log4j.jar
+%{ant_home}/lib/%{name}-apache-log4j.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-log4j-%{version}.jar.*
@@ -1217,6 +1232,7 @@ fi
 %{_javadir}/%{name}/%{name}-apache-oro.jar
 %{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-oro.jar
+%{ant_home}/lib/%{name}-apache-oro.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro
 %{ant_home}/etc/maudit-frames.xsl
 %if %{gcj_support}
@@ -1228,6 +1244,7 @@ fi
 %{_javadir}/%{name}/%{name}-apache-regexp.jar
 %{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar
 %{_javadir}/%{name}/%{name}-jakarta-regexp.jar
+%{ant_home}/lib/%{name}-apache-regexp.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-apache-regexp-%{version}.jar.*
@@ -1237,6 +1254,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-javamail.jar
 %{_javadir}/%{name}/%{name}-javamail-%{version}.jar
+%{ant_home}/lib/%{name}-javamail.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/javamail
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-javamail-%{version}.jar.*
@@ -1246,6 +1264,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jdepend.jar
 %{_javadir}/%{name}/%{name}-jdepend-%{version}.jar
+%{ant_home}/lib/%{name}-jdepend.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
 %{ant_home}/etc/jdepend.xsl
 %{ant_home}/etc/jdepend-frames.xsl
@@ -1257,6 +1276,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-jsch.jar
 %{_javadir}/%{name}/%{name}-jsch-%{version}.jar
+%{ant_home}/lib/%{name}-jsch.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/jsch
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/ant-jsch-%{version}.jar.*
@@ -1266,6 +1286,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}/%{name}-junit.jar
 %{_javadir}/%{name}/%{name}-junit-%{version}.jar
+%{ant_home}/lib/%{name}-junit.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/junit
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
@@ -1292,6 +1313,9 @@ fi
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Aug  7 2009 Orion Poplawski <orion@cora.nwra.com> - 0:1.1.7-11
+- Add links to jar files into %{ant_home} (Bug #179759)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7.1-10.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild