From 8501d08b03cbc9508e3e7b2f18d7ac8ba6ddda70 Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Tue, 11 Jan 2005 14:51:11 +0000
Subject: [PATCH] Sync with RHAPS

---
 junit.spec | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/junit.spec b/junit.spec
index c00c385..a7c1c09 100644
--- a/junit.spec
+++ b/junit.spec
@@ -1,6 +1,6 @@
 %define	name		junit
 %define	version		3.8.1
-%define	release		3jpp_3fc
+%define	release		3jpp_4fc
 %define	section		free
 
 Name:		%{name}
@@ -16,6 +16,7 @@ Group:		Development/Testing
 Source:		http://osdn.dl.sourceforge.net/junit/junit3.8.1.zip
 BuildRequires:	ant
 BuildRequires:	jpackage-utils >= 0:1.5
+BuildRequires:  coreutils
 Buildarch:	noarch
 Buildroot:	%{_tmppath}/%{name}-%{version}-buildroot
 
@@ -52,16 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 %setup -n %{name}%{version}
 # extract sources
 jar xvf src.jar
-# delete stuff that doesn't work with libgcj (#130006).
-if java -version 2>&1 | grep -q "gcj"; then
-    rm -f junit/swingui/AboutDialog.java
-    rm -f junit/swingui/CounterPanel.java
-    rm -f junit/swingui/FailureRunView.java
-    rm -f junit/swingui/TestHierarchyRunView.java
-    rm -f junit/swingui/TestRunner.java
-    rm -f junit/swingui/TestSelector.java
-    rm -f junit/swingui/TestSuitePanel.java
-fi
 
 %build
 ant dist
@@ -112,9 +103,16 @@ fi
 %{_datadir}/%{name}/*
 
 %changelog
+* Tue Jan 11 2005 Gary Benson <gbenson@redhat.com> 0:3.8.1-3jpp_4fc
+- Reenable building of classes that require javax.swing (#130006).
+- Sync with RHAPS.
+
 * Thu Nov  4 2004 Gary Benson <gbenson@redhat.com> 0:3.8.1-3jpp_3fc
 - Build into Fedora.
 
+* Fri Oct 1 2004 Andrew Overholt <overholt@redhat.com> 0:3.8.1-3jpp_3rh
+- add coreutils BuildRequires
+
 * Fri Mar 26 2004 Frank Ch. Eigler <fche@redhat.com> 0:3.8.1-3jpp_2rh
 - add RHUG upgrade cleanup