[ant] Fix antRun script
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Sep 3 17:20:57 UTC 2013
commit 9e573779aa2c1425c42f7fbc791e6060774f644b
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri Aug 30 19:01:20 2013 +0200
Fix antRun script
- Resolves: rhbz#675949
Signed-off-by: Mikolaj Izdebski <mizdebsk at redhat.com>
ant.spec | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index a000c6d..1051790 100644
--- a/ant.spec
+++ b/ant.spec
@@ -36,7 +36,7 @@
Name: ant
Version: 1.9.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -360,7 +360,7 @@ rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
%install
# ANT_HOME and subdirs
-mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc}
+mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -410,6 +410,8 @@ cp -p src/etc/*.xsl $RPM_BUILD_ROOT%{ant_home}/etc
# install everything else
mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p src/script/* $RPM_BUILD_ROOT%{_bindir}
+ln -sf %{_bindir}/ant $RPM_BUILD_ROOT%{ant_home}/bin/
+ln -sf %{_bindir}/antRun $RPM_BUILD_ROOT%{ant_home}/bin/
# default ant.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
@@ -466,6 +468,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%{_javadir}/%{name}/%{name}-launcher.jar
%{_javadir}/%{name}/%{name}-bootstrap.jar
%dir %{ant_home}
+%dir %{ant_home}/bin
+%{ant_home}/bin/ant
+%{ant_home}/bin/antRun
%dir %{ant_home}/etc
%{ant_home}/etc/ant-update.xsl
%{ant_home}/etc/changelog.xsl
@@ -599,6 +604,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Fri Aug 30 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.9.2-6
+- Fix antRun script
+- Resolves: rhbz#675949
+
* Thu Aug 08 2013 Michal Srb <msrb at redhat.com> - 0:1.9.2-5
- xerces-j2 and xml-commons-apis should be in classpath (Resolves: rhbz#994556)
More information about the scm-commits
mailing list