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