rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Avoid installing antRun auxiliary script in bindir, keep it in ant_home

Browse Source
This commit is contained in:
Michael Simacek 2018-08-02 13:18:08 +02:00
parent 0ae3e84a48
commit 30c82d2c04
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ant.spec
View File

@ -455,9 +455,9 @@ 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/{ant,antRun} $RPM_BUILD_ROOT%{_bindir} cp -p src/script/ant $RPM_BUILD_ROOT%{_bindir}/
ln -sf %{_bindir}/ant $RPM_BUILD_ROOT%{ant_home}/bin/ ln -sf %{_bindir}/ant $RPM_BUILD_ROOT%{ant_home}/bin/
ln -sf %{_bindir}/antRun $RPM_BUILD_ROOT%{ant_home}/bin/ cp -p src/script/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}
@ -513,10 +513,9 @@ LC_ALL=en_US.utf8 %{ant} test
%license LICENSE NOTICE %license LICENSE NOTICE
%config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/ant
%attr(0755,root,root) %{_bindir}/antRun
%dir %{ant_home}/bin %dir %{ant_home}/bin
%{ant_home}/bin/ant %{ant_home}/bin/ant
%{ant_home}/bin/antRun %attr(0755,root,root) %{ant_home}/bin/antRun
%{_mandir}/man1/%{name}.* %{_mandir}/man1/%{name}.*
%dir %{ant_home}/etc %dir %{ant_home}/etc
%{ant_home}/etc/ant-update.xsl %{ant_home}/etc/ant-update.xsl
@ -646,6 +645,7 @@ LC_ALL=en_US.utf8 %{ant} test
%changelog %changelog
* Thu Aug 02 2018 Michael Simacek <msimacek@redhat.com> - 0:1.10.4-4 * Thu Aug 02 2018 Michael Simacek <msimacek@redhat.com> - 0:1.10.4-4
- Add a manpage - Add a manpage
- Avoid installing antRun auxiliary script in bindir, keep it in ant_home
* Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:1.10.4-3 * Mon Jul 30 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:1.10.4-3
- Require javapackages-tools for ant script. - Require javapackages-tools for ant script.