From 883440680901de8caf1828ced6c26a179584de14 Mon Sep 17 00:00:00 2001
From: Tomas Radej <tradej@redhat.com>
Date: Thu, 21 Mar 2013 14:49:27 +0100
Subject: [PATCH] No hamcrest src

---
 .gitignore                  |  1 +
 junit-no-hamcrest-src.patch | 31 +++++++++++++++++++++++++++++++
 junit.spec                  |  2 ++
 sources                     |  2 +-
 4 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 junit-no-hamcrest-src.patch

diff --git a/.gitignore b/.gitignore
index d63afe5..abe74ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 junit3.8.2.zip
 /junit-4.10.tar.xz
+/r4.11.tar.gz
diff --git a/junit-no-hamcrest-src.patch b/junit-no-hamcrest-src.patch
new file mode 100644
index 0000000..f4a1afe
--- /dev/null
+++ b/junit-no-hamcrest-src.patch
@@ -0,0 +1,31 @@
+diff --git a/build.xml b/build.xml
+index 0efaf87..62e1df3 100644
+--- a/build.xml
++++ b/build.xml
+@@ -30,7 +30,6 @@
+   <property name="javadoczip" location="${dist}-javadoc.zip" />
+   <property name="hamcrestlib" location="lib/hamcrest-core-1.3.jar" />
+   <property name="hamcrestlibsources" location="lib/hamcrest-core-1.3-sources.jar" />
+-  <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
+ 
+   <property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
+ 
+@@ -125,10 +124,6 @@
+     </copy>
+   </target>
+ 
+-  <target name="unjar.hamcrest">
+-    <unjar src="${hamcrestlibsources}" dest="${hamcrestsrc}" />
+-  </target>
+-  
+   <target name="release-notes">
+     <property name="basename" value="doc/ReleaseNotes${version-base}" />
+     <exec executable="perl" failonerror="true">
+@@ -151,7 +146,6 @@
+       <excludepackage name="org.junit.experimental.theories.internal.*" />
+       
+       <sourcepath location="${src}" />
+-      <sourcepath location="${hamcrestsrc}" />
+       <link href="http://java.sun.com/javase/6/docs/api/" />
+     </javadoc>
+   </target>
diff --git a/junit.spec b/junit.spec
index 6bc9194..8ee58d1 100644
--- a/junit.spec
+++ b/junit.spec
@@ -41,6 +41,7 @@ BuildArch:      noarch
 Source0:        https://github.com/junit-team/junit/archive/r%{version}.tar.gz
 Source2:        junit-OSGi-MANIFEST.MF
 Patch0:         %{name}-removed-test.patch
+Patch1:         %{name}-no-hamcrest-src.patch
 
 BuildRequires:  ant
 BuildRequires:  ant-contrib
@@ -96,6 +97,7 @@ Demonstrations and samples for %{name}.
 %prep
 %setup -q -n %{name}-r%{version}
 #%patch0 -p1
+%patch1 -p1
 cp build/maven/junit-pom-template.xml pom.xml
 find -iname '*.class' -o -iname '*.jar' -delete
 ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
diff --git a/sources b/sources
index cbcfd7d..ba47ce6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48a301080612344294fdfe123f7abe91  junit-4.10.tar.xz
+bf62095e510f50baf0962af329438647  r4.11.tar.gz