Added patch

This commit is contained in:
Tomas Radej 2012-02-07 17:39:39 +01:00
parent ed545c2a60
commit 47e6951153
2 changed files with 23 additions and 1 deletions

19
ant-classpath-check.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/src/script/.ant.swp b/src/script/.ant.swp
index 7962473..b214d30 100644
Binary files a/src/script/.ant.swp and b/src/script/.ant.swp differ
diff --git a/src/script/ant b/src/script/ant
index 0dc84e0..11c1b59 100644
--- a/src/script/ant
+++ b/src/script/ant
@@ -176,10 +176,7 @@ if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then
*.rpmnew) ;;
*)
for dep in `cat "$file"`; do
- case "$OPT_JAR_LIST" in
- *"$dep"*) ;;
- *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
- esac
+ OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
done
esac
fi

View File

@ -50,7 +50,7 @@
Name: ant Name: ant
Version: 1.8.2 Version: 1.8.2
Release: 8%{?dist} Release: 9%{?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
@ -767,6 +767,9 @@ 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-9
- Added patch
* Tue Feb 07 2012 Tomas Radej <tradej@redhat.com> - 0:1.8.2-8 * Tue Feb 07 2012 Tomas Radej <tradej@redhat.com> - 0:1.8.2-8
- Removed checking for classpath duplicates - Removed checking for classpath duplicates
- Added ant-junit4.jar into %files and ant.d - Added ant-junit4.jar into %files and ant.d