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

Remove unnecessary bootstrap conditionals, fix testutil name

Browse Source
This commit is contained in:
Orion Poplawski 2010-10-28 17:11:26 -06:00
parent c803ef5a3e
commit 950c4fe283
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ant.spec
View File

@ -415,9 +415,8 @@ Optional junit tasks for %{name}.
%description junit -l fr %description junit -l fr
Taches junit optionelles pour %{name}. Taches junit optionelles pour %{name}.
%if %without bootstrap
%package testutil %package testutil
Summary: Optional testutil tasks for %{name} Summary: Test utility classes for %{name}
Group: Development/Build Tools Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
@ -425,11 +424,7 @@ Requires: junit
Provides: ant-testutil = %{epoch}:%{version}-%{release} Provides: ant-testutil = %{epoch}:%{version}-%{release}
%description testutil %description testutil
Optional testutil tasks for %{name}. Test utility tasks for %{name}.
%description testutil -l fr
Taches testutil additionels pour %{name}.
%endif
%package scripts %package scripts
Summary: Additional scripts for %{name} Summary: Additional scripts for %{name}
@ -621,10 +616,8 @@ echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/j
echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit echo "junit ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
%if %without bootstrap
echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
%endif %endif
%endif
%if %{build_javadoc} %if %{build_javadoc}
# javadoc # javadoc
@ -848,14 +841,12 @@ rm -rf $RPM_BUILD_ROOT
%{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl %{ant_home}/etc/junit-noframes.xsl
%if %without bootstrap
%files testutil %files testutil
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-testutil.jar %{_javadir}/%{name}/%{name}-testutil.jar
%{_javadir}/%{name}/%{name}-testutil-%{version}.jar %{_javadir}/%{name}/%{name}-testutil-%{version}.jar
%{ant_home}/lib/%{name}-testutil.jar %{ant_home}/lib/%{name}-testutil.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/testutil %config(noreplace) %{_sysconfdir}/%{name}.d/testutil
%endif
%files scripts %files scripts
%defattr(0755,root,root,0755) %defattr(0755,root,root,0755)