rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk-netxtmp.patch, 1.1, 1.2 java-1.6.0-openjdk.spec, 1.31, 1.32

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19000

Modified Files:
	java-1.6.0-openjdk-netxtmp.patch java-1.6.0-openjdk.spec 
Log Message:
* Mon Oct 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-1.0.b12.2
- Remove the tmpdir dialog from JNLP client (#467591)
- Require gecko-devel recent enough not to pull in firefox-devel 1.5


java-1.6.0-openjdk-netxtmp.patch:

Index: java-1.6.0-openjdk-netxtmp.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk-netxtmp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.6.0-openjdk-netxtmp.patch	27 Oct 2008 14:39:11 -0000	1.1
+++ java-1.6.0-openjdk-netxtmp.patch	27 Oct 2008 15:33:59 -0000	1.2
@@ -186,7 +186,7 @@
      /**
       * Returns the system default base dir for or if not set,
 -     * prompts the user for the location.
-+     * uses java.io.tmpdir system property.
++     * uses ~/.netx
       *
       * @return the base dir, or null if the user canceled the dialog
       * @throws IOException if there was an io exception
@@ -211,9 +211,9 @@
 -
 -        props.setProperty("basedir", baseDir.toString());
 -        props.store();
-+        baseStr = System.getProperty("java.io.tmpdir");
++        baseStr = System.getProperty("user.home");
 +        if (baseStr != null)
-+            return new File(baseStr);
++            return new File(baseStr + "/.netx");
  
 -        return baseDir;
 +        return null;


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- java-1.6.0-openjdk.spec	27 Oct 2008 14:39:11 -0000	1.31
+++ java-1.6.0-openjdk.spec	27 Oct 2008 15:33:59 -0000	1.32
@@ -184,7 +184,7 @@
 BuildRequires: pkgconfig >= 0.9.0
 BuildRequires: xorg-x11-utils
 # IcedTeaPlugin build requirements.
-BuildRequires: gecko-devel
+BuildRequires: gecko-devel >= 1.9
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 BuildRequires: xulrunner-devel
@@ -341,6 +341,7 @@
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
 %patch2
+%patch11 -p1
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 cp %{SOURCE7} .
@@ -884,6 +885,7 @@
 %changelog
 * Mon Oct 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-1.0.b12.2
 - Remove the tmpdir dialog from JNLP client (#467591)
+- Require gecko-devel recent enough not to pull in firefox-devel 1.5
 
 * Fri Oct 24 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-1.0.b12.1
 - Merge 1.3.1 with IcedTeaPlugin from devel.