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

Removed checking for classpath duplicates + ant-junit4.jar integration

Browse Source
This commit is contained in:
Tomas Radej 2012-02-02 16:44:23 +01:00
parent 22f6a25510
commit ed545c2a60
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ant.spec
View File

@ -50,7 +50,7 @@
Name: ant Name: ant
Version: 1.8.2 Version: 1.8.2
Release: 7%{?dist} Release: 8%{?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
@ -65,6 +65,7 @@ Source2: apache-ant-%{major_version}.ant.conf
Patch1: apache-ant-bz163689.patch Patch1: apache-ant-bz163689.patch
Patch3: apache-ant-no-test-jar.patch Patch3: apache-ant-no-test-jar.patch
Patch4: apache-ant-class-path-in-manifest.patch Patch4: apache-ant-class-path-in-manifest.patch
Patch5: %{name}-classpath-check.patch
BuildRequires: jpackage-utils >= 0:1.7.5 BuildRequires: jpackage-utils >= 0:1.7.5
BuildRequires: java-devel >= 0:1.5.0 BuildRequires: java-devel >= 0:1.5.0
@ -442,6 +443,10 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t
# Fix class-path-in-manifest rpmlint warning # Fix class-path-in-manifest rpmlint warning
%patch4 %patch4
# Removed checking for classpath duplicates (cause for BZ #755325)
# Accepted in upstream, release pending
%patch5 -p1
# clean jar files # clean jar files
find . -name "*.jar" | %{_bindir}/xargs -t rm find . -name "*.jar" | %{_bindir}/xargs -t rm
@ -576,6 +581,7 @@ 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
echo "junit ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
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
@ -732,8 +738,11 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
%files junit %files junit
%{_javadir}/%{name}/%{name}-junit.jar %{_javadir}/%{name}/%{name}-junit.jar
%{_javadir}/%{name}/%{name}-junit4.jar
%{ant_home}/lib/%{name}-junit.jar %{ant_home}/lib/%{name}-junit.jar
%{ant_home}/lib/%{name}-junit4.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/junit %config(noreplace) %{_sysconfdir}/%{name}.d/junit
%config(noreplace) %{_sysconfdir}/%{name}.d/junit4
%{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-frames.xsl
%{ant_home}/etc/junit-noframes.xsl %{ant_home}/etc/junit-noframes.xsl
@ -758,6 +767,10 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Tue Feb 07 2012 Tomas Radej <tradej@redhat.com> - 0:1.8.2-8
- Removed checking for classpath duplicates
- Added ant-junit4.jar into %files and ant.d
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.8.2-7 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.8.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild