New upstream release

Remove temp. patch to resolve JDK-1.7 issue
This commit is contained in:
Jochen Schmitt 2011-09-25 20:00:05 +02:00 committed by Michel Alexandre Salim
commit 77ce18e5cb
4 changed files with 9 additions and 28 deletions

1
.gitignore vendored
View file

@ -2,3 +2,4 @@ clojure-1.1.0.zip
/clojure-1.2.0.zip
/clojure-1.2.1.zip
/clojure-1.3.0-RC0.zip
/clojure-1.3.0.zip

View file

@ -1,19 +0,0 @@
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"

View file

@ -1,19 +1,15 @@
Name: clojure
Epoch: 1
Version: 1.3.0
Release: 0.1%{?dist}
Release: 1%{?dist}
Summary: A dynamic programming language that targets the Java Virtual Machine
Group: Development/Languages
License: EPL
URL: http://clojure.org/
Source0: http://repo1.maven.org/maven2/org/clojure/clojure/%{version}-RC0/clojure-%{version}-RC0.zip
Source0: http://repo1.maven.org/maven2/org/clojure/clojure/%{version}/clojure-%{version}.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
@ -38,8 +34,7 @@ optional type hints and type inference, to ensure that calls to Java
can avoid reflection.
%prep
%setup -q -n clojure-%{version}-RC0
%patch1 -p1 -b .notest
%setup -q
rm -f *.jar
%build
@ -86,6 +81,10 @@ rm -rf %{buildroot}
%{_mavendepmapfragdir}/*
%changelog
* Sun Sep 25 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:1.3.0-1
- New upstream release
- Remove temp. patch to resolve JDK-1.7 issue
* Wed Sep 21 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:1.3.0-0.1
- New upstrem release
- Remove no-classpath patch (#684060)

View file

@ -1 +1 @@
4944a5537f3008f053b181be2f111ac7 clojure-1.3.0-RC0.zip
de91ee9914017a38c7cc391ab8fcbc1a clojure-1.3.0.zip