rpms/gridengine/devel gridengine-6.2-import.patch, NONE, 1.1 gridengine.spec, 1.11, 1.12

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1705

Modified Files:
	gridengine.spec 
Added Files:
	gridengine-6.2-import.patch 
Log Message:
* Thu Feb 19 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-3
- Add patch to import specific classes to avoid pulling in other ones


gridengine-6.2-import.patch:

--- NEW FILE gridengine-6.2-import.patch ---
--- gridengine/source/libs/jdrmaa/test/DrmaaSuite.java.import	2008-04-24 03:59:00.000000000 -0600
+++ gridengine/source/libs/jdrmaa/test/DrmaaSuite.java	2009-02-19 16:23:56.000000000 -0700
@@ -5,7 +5,9 @@
  * Created on November 14, 2004, 12:50 AM
  */
 
-import junit.framework.*;
+import junit.framework.TestSuite;
+import junit.framework.TestCase;
+import junit.framework.Test;
 
 /**
  *


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gridengine.spec	16 Jan 2009 03:16:52 -0000	1.11
+++ gridengine.spec	19 Feb 2009 23:42:12 -0000	1.12
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2u1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -47,6 +47,9 @@
 # aimk sets -Werror, but there are lots of warnings
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2112
 Patch7: gridengine-6.1pre-Werror.patch
+# Import specific classes to avoid pulling in other ones
+# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2924
+Patch8: gridengine-6.2-import.patch
 # Support lesstif - http://gridengine.sunsource.net/issues/show_bug.cgi?id=2310
 Patch15: gridengine-6.2beta2-lesstif.patch
 # Make inst_sge exit with status 1 if usage is incorrect
@@ -163,6 +166,7 @@
 %patch5 -p1 -b .jni
 %patch6 -p1 -b .db
 %patch7 -p1 -b .Werror
+%patch8 -p1 -b .import
 %if !0%{?rhel}
 %patch15 -p1 -b .lesstif
 %endif
@@ -524,6 +528,9 @@
 
 
 %changelog
+* Thu Feb 19 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-3
+- Add patch to import specific classes to avoid pulling in other ones
+
 * Thu Jan 15 2009 - Orion Poplawski <orion at cora.nwra.com> - 6.2u1-2
 - Rebuild with openssl-0.9.8j