rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-java-access-bridge-idlj.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.67, 1.68

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17101

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-java-access-bridge-idlj.patch 
Log Message:

* Thu Jul 31 2008 Lillian Angel <langel at redhat.com> 1:1.6.0-0.20.b11
- Added java-access-bridge idlj patch. Temp workaround for bug similar to:
http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6708395.



java-1.6.0-openjdk-java-access-bridge-idlj.patch:

--- NEW FILE java-1.6.0-openjdk-java-access-bridge-idlj.patch ---
--- oldjava-access-bridge-1.23.0/idlgen/Makefile.am	2008-06-03 02:47:29.000000000 -0400
+++ java-access-bridge-1.23.0/idlgen/Makefile.am	2008-07-31 15:13:26.000000000 -0400
@@ -3,7 +3,7 @@
 JARFILES=../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
 CLASSES=$(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
 JAR=jar
-IDLJ_FLAGS=-emitAll $(IDLJ_IDLDIRS)
+IDLJ_FLAGS=-J-client -emitAll $(IDLJ_IDLDIRS)
 
 BONOBO_ACT_IDLFILES=$(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
 BONOBO_IDLFILES=$(wildcard $(BONOBO_IDLDIR)/*.idl)
--- oldjava-access-bridge-1.23.0/idlgen/Makefile.in	2008-06-23 23:34:59.000000000 -0400
+++ java-access-bridge-1.23.0/idlgen/Makefile.in	2008-07-31 15:13:45.000000000 -0400
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -140,7 +140,7 @@
 SUBDIRS = org
 JARFILES = ../gnome-java-bridge.jar ../$(EXTRA_JARFILES)
 CLASSES = $(wildcard org/GNOME/Bonobo/*.class org/GNOME/Accessibility/*.class)
-IDLJ_FLAGS = -emitAll $(IDLJ_IDLDIRS)
+IDLJ_FLAGS = -J-client -emitAll $(IDLJ_IDLDIRS)
 BONOBO_ACT_IDLFILES = $(wildcard $(BONOBO_ACT_IDLDIR)/*.idl)
 BONOBO_IDLFILES = $(wildcard $(BONOBO_IDLDIR)/*.idl)
 AT_SPI_IDLFILES = $(wildcard $(AT_SPI_IDLDIR)/*.idl)
@@ -253,8 +253,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -279,8 +279,8 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -290,13 +290,12 @@
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- java-1.6.0-openjdk.spec	28 Jul 2008 14:08:15 -0000	1.67
+++ java-1.6.0-openjdk.spec	31 Jul 2008 19:21:27 -0000	1.68
@@ -138,7 +138,8 @@
 # applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
-Patch2: java-1.6.0-openjdk-makefile.patch
+Patch2:   java-1.6.0-openjdk-makefile.patch
+Patch3:   java-1.6.0-openjdk-java-access-bridge-idlj.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -365,6 +366,7 @@
 # Build Java Access Bridge for GNOME.
 pushd java-access-bridge-%{accessver}
   patch -l -p1 < %{PATCH1}
+  patch -l -p1 < %{PATCH3}
   OLD_PATH=$PATH
   export PATH=$JAVA_HOME/bin:$OLD_PATH
   ./configure
@@ -899,6 +901,10 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Thu Jul 31 2008 Lillian Angel <langel at redhat.com> 1:1.6.0-0.20.b11
+- Added java-access-bridge idlj patch. Temp workaround for bug similar to:
+http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6708395. 
+
 * Mon Jul 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
 - Removed freetype patch.