[ant] Remove unnecessary bootstrap conditionals, fix testutil name
Orion Poplawski
orion at fedoraproject.org
Thu Oct 28 23:12:00 UTC 2010
commit 950c4fe283d60ccf33444c20942e3f3585b2433a
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Oct 28 17:11:26 2010 -0600
Remove unnecessary bootstrap conditionals, fix testutil name
ant.spec | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 185f086..0cdd66f 100644
--- a/ant.spec
+++ b/ant.spec
@@ -415,9 +415,8 @@ Optional junit tasks for %{name}.
%description junit -l fr
Taches junit optionelles pour %{name}.
-%if %without bootstrap
%package testutil
-Summary: Optional testutil tasks for %{name}
+Summary: Test utility classes for %{name}
Group: Development/Build Tools
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
@@ -425,11 +424,7 @@ Requires: junit
Provides: ant-testutil = %{epoch}:%{version}-%{release}
%description testutil
-Optional testutil tasks for %{name}.
-
-%description testutil -l fr
-Taches testutil additionels pour %{name}.
-%endif
+Test utility tasks for %{name}.
%package scripts
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 "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
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
%endif
-%endif
%if %{build_javadoc}
# javadoc
@@ -848,14 +841,12 @@ rm -rf $RPM_BUILD_ROOT
%{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl
-%if %without bootstrap
%files testutil
%defattr(0644,root,root,0755)
%{_javadir}/%{name}/%{name}-testutil.jar
%{_javadir}/%{name}/%{name}-testutil-%{version}.jar
%{ant_home}/lib/%{name}-testutil.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/testutil
-%endif
%files scripts
%defattr(0755,root,root,0755)
More information about the scm-commits
mailing list