[clojure/f16: 5/12] Revert "New upstrem release" so we can cherry-pick changes from F17 more easily

[Michel Alexandre Salim]

commit 984dc27a647f5a89f4ed70bcb924cd44688e3cc3
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Jun 7 17:20:51 2012 +0700

    Revert "New upstrem release" so we can cherry-pick changes from F17 more
    easily
    
    This reverts commit 37f680ec274c9b0b63e18c166bb7f13f71f62286.

 .gitignore                       |    2 --
 clojure-1.1.0-no_classpath.patch |   23 +++++++++++++++++++++++
 clojure.spec                     |   11 +++++------
 sources                          |    2 +-
 4 files changed, 29 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 20e7396..00900d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 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
diff --git a/clojure-1.1.0-no_classpath.patch b/clojure-1.1.0-no_classpath.patch
new file mode 100644
index 0000000..34e4ac0
--- /dev/null
+++ b/clojure-1.1.0-no_classpath.patch
@@ -0,0 +1,23 @@
+diff -up clojure-1.1.0/build.xml.nc clojure-1.1.0/build.xml
+--- clojure-1.1.0/build.xml.nc	2010-01-20 21:11:34.418625288 +0100
++++ clojure-1.1.0/build.xml	2010-01-20 21:12:47.706636716 +0100
+@@ -114,8 +114,7 @@
+       </fileset>
+       <manifest>
+         <attribute name="Main-Class" value="clojure.main"/>
+-        <attribute name="Class-Path" value="."/>
+-      </manifest>
++        </manifest>
+     </jar>
+     <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
+   </target>
+@@ -145,8 +144,7 @@
+       </fileset>
+       <manifest>
+         <attribute name="Main-Class" value="clojure.main"/>
+-        <attribute name="Class-Path" value="."/>
+-      </manifest>
++       </manifest>
+     </jar>
+     <copy file="${slim_jar}" tofile="${slim_noversion_jar}" />
+   </target>
diff --git a/clojure.spec b/clojure.spec
index ff0f0b4..ba7d8c7 100644
--- a/clojure.spec
+++ b/clojure.spec
@@ -1,16 +1,18 @@
 
 Name:           clojure
 Epoch:		1
-Version:     	1.3.0
+Version:     	1.2.1
 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}/clojure-%{version}.zip
+Source0:        http://github.com/downloads/clojure/clojure/clojure-%{version}.zip
 Source1:        clojure.sh
 
+Patch1:		clojure-1.1.0-no_classpath.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -37,6 +39,7 @@ can avoid reflection.
 %prep
 %setup -q 
 rm -f *.jar
+%patch1 -p1
 
 %build
 ant
@@ -82,10 +85,6 @@ rm -rf %{buildroot}
 %{_mavendepmapfragdir}/*
 
 %changelog
-* Wed Sep 21 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:1.3.0-1
-- New upstrem release
-- Remove no-classpath patch (#684060)
-
 * Tue Jul 12 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:1.2.1-1
 - New minor bug fixing release from upstream
 
diff --git a/sources b/sources
index f2e6ee5..adc2a96 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de91ee9914017a38c7cc391ab8fcbc1a  clojure-1.3.0.zip
+c5724c624fd6ce6a1d00252c27d53ebe  clojure-1.2.1.zip