rpms/java-1.6.0-openjdk/F-10 java-1.6.0-openjdk-netx.patch, NONE, 1.1 java-1.6.0-openjdk.spec, 1.111, 1.112

[Lillian Angel]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5930

Modified Files:
	java-1.6.0-openjdk.spec 
Added Files:
	java-1.6.0-openjdk-netx.patch 
Log Message:
* Thu Jul  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-19.b16
- Added java-1.6.0-openjdk-netx.patch
- Moved policytool to devel package.
- Updated release.
- Resolves: rhbz#507870
- Resolves: rhbz#471346



java-1.6.0-openjdk-netx.patch:

--- NEW FILE java-1.6.0-openjdk-netx.patch ---
--- ../JNLPRuntime.java	2009-07-09 12:51:44.000000000 -0400
+++ rt/net/sourceforge/jnlp/runtime/JNLPRuntime.java	2009-07-09 12:52:04.000000000 -0400
@@ -282,7 +282,7 @@
 
         String homeDir = System.getProperty("user.home");
 	File baseDir = new File(homeDir + "/.netx/");
-	if (homeDir == null || !baseDir.mkdir())
+	if (homeDir == null || (!baseDir.isDirectory() && !baseDir.mkdir()))
             return null;
 
         props.setProperty("basedir", baseDir.toString());


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -p -r1.111 -r1.112
--- java-1.6.0-openjdk.spec	29 May 2009 18:20:24 -0000	1.111
+++ java-1.6.0-openjdk.spec	9 Jul 2009 18:15:54 -0000	1.112
@@ -130,7 +130,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 18.%{openjdkver}%{?dist}
+Release: 19.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -165,6 +165,7 @@ Patch4:   java-1.6.0-openjdk-java-access
 Patch5:   java-1.6.0-openjdk-accessible-toolkit.patch
 Patch6:   java-1.6.0-openjdk-sparc-fixes.patch
 Patch7:   java-1.6.0-openjdk-sparc-hotspot.patch
+Patch8:	  java-1.6.0-openjdk-netx.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -402,6 +403,7 @@ make patch
 patch -l -p0 < %{PATCH4}
 patch -l -p0 < %{PATCH5}
 patch -l -p0 < %{PATCH7}
+patch -l -p0 < %{PATCH8}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -615,7 +617,6 @@ alternatives \
   --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
   --slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
   --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
-  --slave %{_bindir}/policytool policytool %{jrebindir}/policytool \
   --slave %{_bindir}/rmid rmid %{jrebindir}/rmid \
   --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry \
   --slave %{_bindir}/servertool servertool %{jrebindir}/servertool \
@@ -629,8 +630,6 @@ alternatives \
   %{_mandir}/man1/orbd-%{name}.1$ext \
   --slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \
   %{_mandir}/man1/pack200-%{name}.1$ext \
-  --slave %{_mandir}/man1/policytool.1$ext policytool.1$ext \
-  %{_mandir}/man1/policytool-%{name}.1$ext \
   --slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \
   %{_mandir}/man1/rmid-%{name}.1$ext \
   --slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \
@@ -708,6 +707,7 @@ alternatives \
   --slave %{_bindir}/jstat jstat %{sdkbindir}/jstat \
   --slave %{_bindir}/jstatd jstatd %{sdkbindir}/jstatd \
   --slave %{_bindir}/native2ascii native2ascii %{sdkbindir}/native2ascii \
+  --slave %{_bindir}/policytool policytool %{sdkbindir}/policytool \
   --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic \
   --slave %{_bindir}/schemagen schemagen %{sdkbindir}/schemagen \
   --slave %{_bindir}/serialver serialver %{sdkbindir}/serialver \
@@ -756,6 +756,8 @@ alternatives \
   %{_mandir}/man1/jstatd-%{name}.1$ext \
   --slave %{_mandir}/man1/native2ascii.1$ext native2ascii.1$ext \
   %{_mandir}/man1/native2ascii-%{name}.1$ext \
+  --slave %{_mandir}/man1/policytool.1$ext policytool.1$ext \
+  %{_mandir}/man1/policytool-%{name}.1$ext \
   --slave %{_mandir}/man1/rmic.1$ext rmic.1$ext \
   %{_mandir}/man1/rmic-%{name}.1$ext \
   --slave %{_mandir}/man1/schemagen.1$ext schemagen.1$ext \
@@ -852,13 +854,11 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/security/cacerts
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
-%{_datadir}/applications/*policytool.desktop
 %{_datadir}/icons/hicolor/*x*/apps/java.png
 %{_mandir}/man1/java-%{name}.1*
 %{_mandir}/man1/keytool-%{name}.1*
 %{_mandir}/man1/orbd-%{name}.1*
 %{_mandir}/man1/pack200-%{name}.1*
-%{_mandir}/man1/policytool-%{name}.1*
 %{_mandir}/man1/rmid-%{name}.1*
 %{_mandir}/man1/rmiregistry-%{name}.1*
 %{_mandir}/man1/servertool-%{name}.1*
@@ -890,6 +890,7 @@ exit 0
 %{_jvmdir}/%{sdklnk}
 %{_jvmjardir}/%{sdklnk}
 %{_datadir}/applications/*jconsole.desktop
+%{_datadir}/applications/*policytool.desktop
 %{_mandir}/man1/appletviewer-%{name}.1*
 %{_mandir}/man1/apt-%{name}.1*
 %{_mandir}/man1/extcheck-%{name}.1*
@@ -912,6 +913,7 @@ exit 0
 %{_mandir}/man1/jstat-%{name}.1*
 %{_mandir}/man1/jstatd-%{name}.1*
 %{_mandir}/man1/native2ascii-%{name}.1*
+%{_mandir}/man1/policytool-%{name}.1*
 %{_mandir}/man1/rmic-%{name}.1*
 %{_mandir}/man1/schemagen-%{name}.1*
 %{_mandir}/man1/serialver-%{name}.1*
@@ -945,6 +947,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
+* Thu Jul  9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-19.b16
+- Added java-1.6.0-openjdk-netx.patch
+- Moved policytool to devel package.
+- Updated release.
+- Resolves: rhbz#507870
+- Resolves: rhbz#471346
+
 * Fri May 29 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-18.b16
 - Fixed abs-install-dir.
 - Updated release.