rpms/java-1.5.0-gcj/F-13 javadoc-workaround.patch, NONE, 1.1 java-1.5.0-gcj.spec, 1.47, 1.48

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/java-1.5.0-gcj/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10090/F-13

Modified Files:
	java-1.5.0-gcj.spec 
Added Files:
	javadoc-workaround.patch 
Log Message:
* Tue May  4 2010 Michel Salim <salimma at fedoraproject.org> - 1.5.0.0-32
- no longer require perl; Lua abs2rel script now in jpackage-utils


javadoc-workaround.patch:
 DefaultMutableTreeNode.java |    9 ---------
 1 file changed, 9 deletions(-)

--- NEW FILE javadoc-workaround.patch ---
--- javax/swing/tree/DefaultMutableTreeNode.java.orig	2008-04-03 11:05:46.000000000 -0400
+++ javax/swing/tree/DefaultMutableTreeNode.java	2008-04-03 11:06:03.000000000 -0400
@@ -38,8 +38,6 @@
 
 package javax.swing.tree;
 
-import gnu.java.util.EmptyEnumeration;
-
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -64,13 +62,6 @@
   private static final long serialVersionUID = -4298474751201349152L;
 
   /**
-   * An empty enumeration, returned by {@link #children()} if a node has no
-   * children.
-   */
-  public static final Enumeration<TreeNode> EMPTY_ENUMERATION =
-    new EmptyEnumeration<TreeNode>();
-
-  /**
    * The parent of this node (possibly <code>null</code>).
    */
   protected MutableTreeNode parent;


Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.5.0-gcj/F-13/java-1.5.0-gcj.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- java-1.5.0-gcj.spec	30 Mar 2010 18:21:40 -0000	1.47
+++ java-1.5.0-gcj.spec	19 May 2010 17:59:16 -0000	1.48
@@ -4,7 +4,7 @@
 # convert an absolute path to a relative path.  each symbolic link is
 # specified relative to the directory in which it is installed so that
 # it will resolve properly within chrooted installations.
-%define abs2rel %{__perl} -e 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])'
+%define abs2rel %{_datadir}/java-utils/abs2rel.sh
 
 # resolve circular dependency between sinjdoc and java-1.5.0-gcj.
 # define to 1 if sinjdoc has not been built yet.
@@ -55,7 +55,7 @@
 
 Name:    %{name}
 Version: %{javaver}.%{buildver}
-Release: 31%{?dist}
+Release: 32%{?dist}
 Summary: JPackage runtime compatibility layer for GCJ
 Group:   Development/Languages
 # The LICENSE file has the classpath exception, but nothing in this package
@@ -84,11 +84,13 @@ BuildRequires: python-devel
 BuildRequires: java-1.6.0-openjdk-devel
 %endif
 BuildRequires: unzip
+# required for abs2rel
+BuildRequires: jpackage-utils >= 1.7.5-3.10
 
 # required for tools and libgcj.jar
 Requires:         libgcj%{gccsuffix} >= %{gccver}
 # required for directory structures
-Requires:         jpackage-utils >= 1.7.3
+Requires:         jpackage-utils >= 1.7.5-3.10
 # required for java.security symlink.  also ensures that the proper
 # libgcj is installed on multilib systems.
 Requires:         %{syslibdir}/security/classpath.security
@@ -120,8 +122,8 @@ Requires(postun): findutils
 Requires(triggerin): %{_sbindir}/alternatives
 # triggerin requires gij to retrieve gcc version
 Requires(triggerin): %{_bindir}/gij%{gccsuffix}
-# triggerin requires perl for abs2rel
-Requires(triggerin): perl
+# triggerin requires jpackage-utils for abs2rel
+Requires(triggerin): jpackage-utils >= 1.7.5-3.10
 
 # standard JPackage base provides
 Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
@@ -181,8 +183,8 @@ Requires(postun): %{_sbindir}/alternativ
 Requires(triggerin): %{_bindir}/gij%{gccsuffix}
 # triggerin requires gcj to retrieve gcj header file locations
 Requires(triggerin): %{_bindir}/gcj%{gccsuffix}
-# triggerin requires perl for abs2rel
-Requires(triggerin): perl
+# triggerin requires jpackage-utils for abs2rel
+Requires(triggerin): jpackage-utils >= 1.7.5-3.10
 
 # standard JPackage devel provides
 Provides: java-sdk-%{javaver}-%{origin} = %{version}
@@ -213,8 +215,8 @@ Requires:       libgcj%{gccsuffix}-src >
 Requires(post): %{_bindir}/gij%{gccsuffix}
 # triggerin requires gij to retrieve gcc version
 Requires(triggerin): %{_bindir}/gij%{gccsuffix}
-# triggerin requires perl for abs2rel
-Requires(triggerin): perl(File::Spec)
+# triggerin requires jpackage-utils for abs2rel
+Requires(triggerin): jpackage-utils >= 1.7.5-3.10
 
 # java-gcj-compat src provides
 Provides: java-1.4.2-gcj-compat-src > 1.4.2.0-40jpp.111
@@ -789,9 +791,11 @@ fi
 %endif
 
 %changelog
-* Tue Mar 30 2010 Deepak Bhole <dbhole at redhat.com> 1.5.0.0-31
-- Resolves: rhbz#577350. Port over Stepan Kasal's changes from devel branch:
-  - require perl(File::Spec) for the triggerin
+* Tue May  4 2010 Michel Salim <salimma at fedoraproject.org> - 1.5.0.0-32
+- no longer require perl; Lua abs2rel script now in jpackage-utils
+
+* Tue Mar 30 2010 Stepan Kasal <skasal at redhat.com> - 1.5.0.0-31
+- require perl(File::Spec) for the triggerin
 
 * Fri Jan 22 2010 Andrew Overholt <overholt at redhat.com> - 1.5.0.0-30
 - Version jaxp_parser_impl Provides to be 1.3 and not this package's version.