Fix antRun script

- Resolves: rhbz#675949

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
This commit is contained in:
Mikolaj Izdebski 2013-08-30 19:01:20 +02:00
parent 26248c0bcc
commit 9e573779aa

View File

@ -36,7 +36,7 @@
Name: ant Name: ant
Version: 1.9.2 Version: 1.9.2
Release: 5%{?dist} Release: 6%{?dist}
Epoch: 0 Epoch: 0
Summary: Build tool for java Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi 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 %install
# ANT_HOME and subdirs # ANT_HOME and subdirs
mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc} mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
# jars # jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name} 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 # install everything else
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
cp -p src/script/* $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 # default ant.conf
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} 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}-launcher.jar
%{_javadir}/%{name}/%{name}-bootstrap.jar %{_javadir}/%{name}/%{name}-bootstrap.jar
%dir %{ant_home} %dir %{ant_home}
%dir %{ant_home}/bin
%{ant_home}/bin/ant
%{ant_home}/bin/antRun
%dir %{ant_home}/etc %dir %{ant_home}/etc
%{ant_home}/etc/ant-update.xsl %{ant_home}/etc/ant-update.xsl
%{ant_home}/etc/changelog.xsl %{ant_home}/etc/changelog.xsl
@ -599,6 +604,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Fri Aug 30 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.2-6
- Fix antRun script
- Resolves: rhbz#675949
* Thu Aug 08 2013 Michal Srb <msrb@redhat.com> - 0:1.9.2-5 * Thu Aug 08 2013 Michal Srb <msrb@redhat.com> - 0:1.9.2-5
- xerces-j2 and xml-commons-apis should be in classpath (Resolves: rhbz#994556) - xerces-j2 and xml-commons-apis should be in classpath (Resolves: rhbz#994556)