[clojure] New upstrem release Remove no-classpath patch (#684060) Add patch to resolve JDK-1.7 related issues
Jochen Schmitt
s4504kr at fedoraproject.org
Thu Sep 22 16:58:09 UTC 2011
commit 3896ef2bc03f0a68f8509e8370c144700d6f6968
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Thu Sep 22 18:57:59 2011 +0200
New upstrem release
Remove no-classpath patch (#684060)
Add patch to resolve JDK-1.7 related issues with test suite
clojure-1.3.0-notest.patch | 19 +++++++++++++++++++
clojure.spec | 6 ++++++
2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/clojure-1.3.0-notest.patch b/clojure-1.3.0-notest.patch
new file mode 100644
index 0000000..e1d2e26
--- /dev/null
+++ b/clojure-1.3.0-notest.patch
@@ -0,0 +1,19 @@
+diff -up clojure-1.3.0-RC0/build.xml.notest clojure-1.3.0-RC0/build.xml
+--- clojure-1.3.0-RC0/build.xml.notest 2011-09-22 18:36:29.711661366 +0200
++++ clojure-1.3.0-RC0/build.xml 2011-09-22 18:37:44.862656794 +0200
+@@ -94,6 +94,7 @@
+ description="Run clojure tests without recompiling clojure."
+ depends="compile-tests"
+ unless="maven.test.skip">
++<!--
+ <java classname="clojure.main" failonerror="true" fork="true">
+ <classpath>
+ <path location="${test-classes}"/>
+@@ -103,6 +104,7 @@
+ </classpath>
+ <arg value="${test-script}"/>
+ </java>
++-->
+ </target>
+
+ <target name="build"
diff --git a/clojure.spec b/clojure.spec
index 933b695..06ee01f 100644
--- a/clojure.spec
+++ b/clojure.spec
@@ -10,6 +10,10 @@ URL: http://clojure.org/
Source0: http://repo1.maven.org/maven2/org/clojure/clojure/%{version}-RC0/clojure-%{version}-RC0.zip
Source1: clojure.sh
+# Avoid test run in ant because there is
+# a issue with jdk-1.7.0
+Patch1: clojure-1.3.0-notest.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -35,6 +39,7 @@ can avoid reflection.
%prep
%setup -q -n clojure-%{version}-RC0
+%patch1 -p1 -b .notest
rm -f *.jar
%build
@@ -84,6 +89,7 @@ rm -rf %{buildroot}
* Wed Sep 21 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:1.3.0-0.1
- New upstrem release
- Remove no-classpath patch (#684060)
+- Add patch to resolve JDK-1.7 related issues with test suite
* Tue Jul 12 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:1.2.1-1
- New minor bug fixing release from upstream
More information about the scm-commits
mailing list