From 47e6951153ec87fc1b85c48e5bc3c2c6cfeae154 Mon Sep 17 00:00:00 2001 From: Tomas Radej Date: Feb 07 2012 16:39:39 +0000 Subject: Added patch --- diff --git a/ant-classpath-check.patch b/ant-classpath-check.patch new file mode 100644 index 0000000..6f55541 --- /dev/null +++ b/ant-classpath-check.patch @@ -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 diff --git a/ant.spec b/ant.spec index f76a640..7979332 100644 --- a/ant.spec +++ b/ant.spec @@ -50,7 +50,7 @@ Name: ant Version: 1.8.2 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: Build tool for 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 +* Tue Feb 07 2012 Tomas Radej - 0:1.8.2-9 +- Added patch + * Tue Feb 07 2012 Tomas Radej - 0:1.8.2-8 - Removed checking for classpath duplicates - Added ant-junit4.jar into %files and ant.d