rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-jconsole.desktop, NONE, 1.1 java-1.6.0-openjdk-policytool.desktop, NONE, 1.1 .cvsignore, 1.18, 1.19 java-1.6.0-openjdk-makefile.patch, 1.2, 1.3 java-1.6.0-openjdk-optflags.patch, 1.6, 1.7 java-1.6.0-openjdk.spec, 1.23, 1.24 sources, 1.17, 1.18

Lillian Angel (langel) fedora-extras-commits at redhat.com
Mon Apr 28 14:27:27 UTC 2008 

Author: langel

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

Modified Files:
	.cvsignore java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk-optflags.patch java-1.6.0-openjdk.spec 
	sources 
Added Files:
	java-1.6.0-openjdk-jconsole.desktop 
	java-1.6.0-openjdk-policytool.desktop 
Log Message:
* Mon Apr 28 2008 Joshua Sumali <jsumali at redhat.com> - 1:1.6.0.0-0.10.b09
- Added javaws menu entry.
- Resolves: rhbz#443851

* Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.10.b09
- Updated release.
- Updated icedteasnapshot.
- Added jconsole and policy menu entries.
- Removed all jhat references.
- Resolves: rhbz#435235
- Resolves: rhbz#417501
- Resolves: rhbz#437418
- Resolves: rhbz#443360
- Resolves: rhbz#304031




--- NEW FILE java-1.6.0-openjdk-jconsole.desktop ---
[Desktop Entry]
Name=Java Monitoring & Management Console
Comment=Monitor and manage Java applications
Exec=jconsole
TryExec=jconsole
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-tools-jconsole-JConsole
Categories=Development;Monitor;Java;
Version=1.0


--- NEW FILE java-1.6.0-openjdk-policytool.desktop ---
[Desktop Entry]
Name=Java Policy Tool
Comment=Manage Java policy files
Exec=policytool
TryExec=policytool
Icon=java
Terminal=false
Type=Application
StartupWMClass=sun-security-tools-PolicyTool
Categories=Development;Java;
Version=1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	18 Apr 2008 14:36:40 -0000	1.18
+++ .cvsignore	28 Apr 2008 14:26:51 -0000	1.19
@@ -1,6 +1,5 @@
 mauve_tests
 java-access-bridge-1.22.0.tar.gz
 mauve-2008-03-11.tar.gz
-openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
-icedtea6-1.2-7a015d5c9cb132abefb7f500852b3fef2ba7615d.tar.gz
 openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
+icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz

java-1.6.0-openjdk-makefile.patch:

Index: java-1.6.0-openjdk-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk-makefile.patch	27 Mar 2008 17:39:29 -0000	1.2
+++ java-1.6.0-openjdk-makefile.patch	28 Apr 2008 14:26:51 -0000	1.3
@@ -1,9 +1,11 @@
---- makeorig	2008-03-27 13:34:52.000000000 -0400
-+++ Makefile.am	2008-03-27 13:35:11.000000000 -0400
-@@ -177,15 +177,6 @@
+--- Makefile.am.orig	2008-04-28 10:11:15.000000000 -0400
++++ Makefile.am	2008-04-28 10:12:16.000000000 -0400
+@@ -201,18 +201,6 @@
  endif
  
  stamps/download.stamp:
+-if USE_ALT_OPENJDK_SRC_ZIP
+-else
 -	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 -	 | $(MD5SUM) --check ; \
 -	then \
@@ -13,42 +15,41 @@
 -	 fi ; \
 -	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
 -	fi
+-endif
  	mkdir -p stamps
  	touch stamps/download.stamp
  
-@@ -292,8 +283,7 @@
- stamps/extract.stamp: stamps/download.stamp
+@@ -320,7 +308,7 @@
  	if ! test -d openjdk ; \
  	then \
--	  mkdir openjdk ; \
+ 	  mkdir openjdk ; \
 -	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
 +	  $(TAR) xzf $(OPENJDK_SRC_ZIP); \
  	  chmod -R ug+w openjdk ; \
  	fi
  	mkdir -p stamps
---- makeinorig	2008-03-27 13:34:58.000000000 -0400
-+++ Makefile.in	2008-03-27 13:35:15.000000000 -0400
-@@ -755,15 +756,6 @@
+--- Makefile.in.orig	2008-04-28 10:11:19.000000000 -0400
++++ Makefile.in	2008-04-28 10:12:19.000000000 -0400
+@@ -788,15 +788,6 @@
  	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
  
  stamps/download.stamp:
--	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
--	 | $(MD5SUM) --check ; \
--	then \
--	 if [ $(OPENJDK_SRC_ZIP) ] ; \
--	 then \
--	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
--	 fi ; \
--	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
--	fi
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 | $(MD5SUM) --check ; \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	then \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 if [ $(OPENJDK_SRC_ZIP) ] ; \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 then \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 fi ; \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
+- at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	fi
  	mkdir -p stamps
  	touch stamps/download.stamp
  
-@@ -792,8 +784,7 @@
- stamps/extract.stamp: stamps/download.stamp
+@@ -826,7 +817,7 @@
  	if ! test -d openjdk ; \
  	then \
--	  mkdir openjdk ; \
+ 	  mkdir openjdk ; \
 -	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
 +	  $(TAR) xzf $(OPENJDK_SRC_ZIP); \
  	  chmod -R ug+w openjdk ; \

java-1.6.0-openjdk-optflags.patch:

Index: java-1.6.0-openjdk-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-optflags.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- java-1.6.0-openjdk-optflags.patch	18 Apr 2008 14:19:04 -0000	1.6
+++ java-1.6.0-openjdk-optflags.patch	28 Apr 2008 14:26:51 -0000	1.7
@@ -60,35 +60,35 @@
 + CXXFLAGS        = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
 + CPPFLAGS        = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
 + 		  $(DEFINES) $(OPTIONS:%=-D%)
---- Makefile.am.orig	2008-04-18 10:06:32.000000000 -0400
-+++ Makefile.am	2008-04-18 10:09:54.000000000 -0400
-@@ -98,6 +98,7 @@
+--- Makefile.am.orig	2008-04-28 10:02:57.000000000 -0400
++++ Makefile.am	2008-04-28 10:03:58.000000000 -0400
+@@ -96,6 +96,7 @@
+ 	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ 	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
  	"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
++	"ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
  	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
  	"FT2_LIB=$(FREETYPE2_LIBS)" \
-+	"ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
  	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
- 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
- 
-@@ -155,6 +156,7 @@
+@@ -159,6 +160,7 @@
+ 	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ 	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
  	"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
++	"ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
  	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
  	"FT2_LIB=$(FREETYPE2_LIBS)" \
-+	"ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
  	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
- 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)"
- 
-@@ -298,6 +300,7 @@
- 	patches/icedtea-ia64-fdlibm.patch \
- 	patches/icedtea-LCMS-setTagData.patch \
+@@ -308,6 +310,7 @@
  	patches/icedtea-color-createcontext.patch \
+ 	patches/icedtea-color-profiles.patch \
+ 	patches/icedtea-fonts.patch \
 +	patches/icedtea-optflags.patch \
  	$(GCC_PATCH) \
- 	$(FAST_BUILD_PATCH) \
  	$(DISTRIBUTION_PATCHES)
---- Makefile.in.orig	2008-04-18 10:06:37.000000000 -0400
-+++ Makefile.in	2008-04-18 10:10:43.000000000 -0400
-@@ -79,6 +79,7 @@
+ 
+--- Makefile.in.orig	2008-04-28 10:03:03.000000000 -0400
++++ Makefile.in	2008-04-28 10:04:59.000000000 -0400
+@@ -87,6 +87,7 @@
  ALSA_CFLAGS = @ALSA_CFLAGS@
  ALSA_LIBS = @ALSA_LIBS@
  ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
@@ -96,63 +96,76 @@
  AMTAR = @AMTAR@
  ANT = @ANT@
  AUTOCONF = @AUTOCONF@
-@@ -299,7 +300,7 @@
+@@ -306,6 +307,7 @@
+ 	"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
  	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
  	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
++	"ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
  	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
--	"FT2_LIB=$(FREETYPE2_LIBS)" \
-+	"FT2_LIB=$(FREETYPE2_LIBS)" "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ 	"FT2_LIB=$(FREETYPE2_LIBS)" \
  	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
- 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_1) \
- 	$(am__append_2)
-@@ -339,7 +340,7 @@
+@@ -346,6 +348,7 @@
+ 	"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
  	"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
  	"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
++	"ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
  	"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
--	"FT2_LIB=$(FREETYPE2_LIBS)" \
-+	"FT2_LIB=$(FREETYPE2_LIBS)" "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ 	"FT2_LIB=$(FREETYPE2_LIBS)" \
  	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
- 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" $(am__append_3) \
- 	$(am__append_4)
-@@ -405,7 +406,8 @@
- 	patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \
- 	patches/icedtea-ia64-fdlibm.patch \
+@@ -411,8 +414,8 @@
  	patches/icedtea-LCMS-setTagData.patch \
--	patches/icedtea-color-createcontext.patch $(GCC_PATCH) \
-+	patches/icedtea-color-createcontext.patch \
-+	patches/icedtea-optflags.patch $(GCC_PATCH) \
- 	$(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5)
+ 	patches/icedtea-color-createcontext.patch \
+ 	patches/icedtea-color-profiles.patch \
+-	patches/icedtea-fonts.patch $(GCC_PATCH) \
+-	$(DISTRIBUTION_PATCHES) $(am__append_7)
++	patches/icedtea-fonts.patch patches/icedtea-optflags.patch \
++	$(GCC_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_7)
  
  # Patch OpenJDK for plug replacements and ecj.
---- configure.orig	2008-04-18 10:06:54.000000000 -0400
-+++ configure	2008-04-18 10:10:32.000000000 -0400
-@@ -720,6 +720,7 @@
+ ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+--- configure.ac.orig	2008-04-28 10:03:16.000000000 -0400
++++ configure.ac	2008-04-28 10:04:44.000000000 -0400
+@@ -22,6 +22,10 @@
+ FIND_TOOL([UNZIP], [unzip])
+ FIND_TOOL([CPIO], [cpio])
+ FIND_TOOL([FILE], [file])
++
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++AC_SUBST(ALT_OPT_CFLAGS)
++
+ AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
+ if test "x$FASTJAR" = x; then
+ 	AC_MSG_ERROR([Can't find fastjar or jar])
+--- configure.orig	2008-04-28 10:03:09.000000000 -0400
++++ configure	2008-04-28 10:04:48.000000000 -0400
+@@ -717,6 +717,7 @@
+ UNZIP
+ CPIO
+ FILE
++ALT_OPT_CFLAGS
  FASTJAR
  ac_ct_FASTJAR
  GAWK
-+ALT_OPT_CFLAGS
- SYSTEM_GCJ_DIR
- SYSTEM_OPENJDK_DIR
- SYSTEM_ICEDTEA_DIR
-@@ -5790,6 +5791,9 @@
- 
+@@ -5569,6 +5570,10 @@
+  fi
  
  
++
 +ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
 +
 +
- 
- # Check whether --with-gcj-home was given.
- if test "${with_gcj_home+set}" = set; then
-@@ -12948,6 +12952,7 @@
+ if test -n "$ac_tool_prefix"; then
+   for ac_prog in fastjar jar
+   do
+@@ -12958,6 +12963,7 @@
+ UNZIP!$UNZIP$ac_delim
+ CPIO!$CPIO$ac_delim
+ FILE!$FILE$ac_delim
++ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
  FASTJAR!$FASTJAR$ac_delim
  ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
  GAWK!$GAWK$ac_delim
-+ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
- SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
- SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim
- SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
-@@ -13031,7 +13036,7 @@
+@@ -13044,7 +13050,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -161,15 +174,3 @@
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
---- configure.ac.orig	2008-04-18 10:06:46.000000000 -0400
-+++ configure.ac	2008-04-18 10:10:28.000000000 -0400
-@@ -31,6 +31,9 @@
- dnl check for it explicitly rather than using AC_PROG_AWK.
- FIND_TOOL([GAWK], [gawk])
- 
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+AC_SUBST(ALT_OPT_CFLAGS)
-+
- AC_ARG_WITH([gcj-home],
- 	    [AS_HELP_STRING([--with-gcj-home],
-                             [gcj home directory \


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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- java-1.6.0-openjdk.spec	18 Apr 2008 14:20:14 -0000	1.23
+++ java-1.6.0-openjdk.spec	28 Apr 2008 14:26:51 -0000	1.24
@@ -4,7 +4,7 @@
 %define gcjbootstrap 0
 
 %define icedteaver 1.2
-%define icedteasnapshot -7a015d5c9cb132abefb7f500852b3fef2ba7615d
+%define icedteasnapshot -0bdd2917dfdb672402a7868206fd4ce9b2690a8c
 %define openjdkver b09
 %define openjdkdate 11_apr_2008
 
@@ -106,7 +106,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.9.%{openjdkver}%{?dist}
+Release: 0.10.%{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
@@ -132,6 +132,8 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
+Source8:  %{name}-jconsole.desktop
+Source9:  %{name}-policytool.desktop
 # FIXME: This patch needs to be fixed. optflags argument -mtune=generic is being ignored
 # because it breaks several graphical applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
@@ -144,6 +146,7 @@
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cups-devel
+BuildRequires: desktop-file-utils
 BuildRequires: giflib-devel
 BuildRequires: lesstif-devel
 BuildRequires: libX11-devel
@@ -181,7 +184,7 @@
 BuildRequires: gecko-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
-# zero-assembler build requirement
+# Zero-assembler build requirement
 %ifnarch x86_64 %{ix86}
 BuildRequires: libffi-devel
 %endif
@@ -198,6 +201,12 @@
 Requires(post):   %{_sbindir}/alternatives
 # Postun requires alternatives to uninstall tool alternatives.
 Requires(postun): %{_sbindir}/alternatives
+# Post requires update-desktop-database to update desktop database
+# for jnlp files.
+Requires(post):   %{_bindir}/update-desktop-database
+# Postun requires update-desktop-database to update desktop database
+# for jnlp files.
+Requires(postun): %{_bindir}/update-desktop-database
 
 # java-1.6.0-openjdk replaces java-1.7.0-icedtea
 Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999
@@ -330,6 +339,8 @@
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 cp %{SOURCE7} .
+cp %{SOURCE8} jconsole.desktop
+cp %{SOURCE9} policytool.desktop
 
 %build
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
@@ -449,6 +460,18 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
 cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
+# Install icons and menu entries
+for s in 16 24 32 48 ; do
+  install -D -p -m 644 \
+    openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png
+done
+for e in jconsole policytool ; do
+    desktop-file-install --vendor=fedora --mode=644 \
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
+done
+
+
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
   | grep -v jre/lib/security \
@@ -485,6 +508,15 @@
   | sed 's|^|%doc |' \
   >> %{name}-demo.files
 
+# Install javaws desktop file.
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
+cp %{_sourcedir}/icedtea6-%{icedteaver}/javaws.png \
+  $RPM_BUILD_ROOT%{_datadir}/pixmaps
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  %{_sourcedir}/icedtea6-%{icedteaver}/javaws.desktop
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -496,6 +528,7 @@
   --install %{_bindir}/java java %{jrebindir}/java %{priority} \
   --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
   --slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
+  --slave %{_bindir}/javaws javaws %{jrebindir}/javaws \
   --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
   --slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
   --slave %{_bindir}/pack200 pack200 %{jrebindir}/pack200 \
@@ -549,6 +582,16 @@
   %{uspolicy} \
   %{_jvmprivdir}/%{archname}/jce/vanilla/US_export_policy.jar
 
+# Update for jnlp handling.
+update-desktop-database -q %{_datadir}/applications || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+exit 0
+
 %postun
 if [ $1 -eq 0 ]
 then
@@ -560,6 +603,16 @@
     %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar
 fi
 
+# Update for jnlp handling.
+update-desktop-database -q %{_datadir}/applications || :
+
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+exit 0
+
 %post devel
 ext=.gz
 alternatives \
@@ -567,7 +620,6 @@
   --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \
   --slave %{_jvmjardir}/java java_sdk_exports %{_jvmjardir}/%{sdklnk} \
   --slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \
-  --slave %{_bindir}/javaws javaws %{sdkbindir}/javaws \
   --slave %{_bindir}/apt apt %{sdkbindir}/apt \
   --slave %{_bindir}/extcheck extcheck %{sdkbindir}/extcheck \
   --slave %{_bindir}/jar jar %{sdkbindir}/jar \
@@ -577,7 +629,6 @@
   --slave %{_bindir}/javap javap %{sdkbindir}/javap \
   --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
   --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
-  --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
   --slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \
   --slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \
   --slave %{_bindir}/jps jps %{sdkbindir}/jps \
@@ -615,8 +666,6 @@
   %{_mandir}/man1/jconsole-%{name}.1$ext \
   --slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \
   %{_mandir}/man1/jdb-%{name}.1$ext \
-  --slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \
-  %{_mandir}/man1/jhat-%{name}.1$ext \
   --slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \
   %{_mandir}/man1/jinfo-%{name}.1$ext \
   --slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \
@@ -660,6 +709,8 @@
   --slave %{_jvmjardir}/java-%{javaver} \
   java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
 
+exit 0
+
 %postun devel
 if [ $1 -eq 0 ]
 then
@@ -668,6 +719,8 @@
   alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
 fi
 
+exit 0
+
 %post javadoc
 alternatives \
   --install %{_javadocdir}/java javadocdir %{_javadocdir}/%{name}/api \
@@ -679,11 +732,15 @@
   alternatives --remove javadocdir %{_javadocdir}/%{name}/api
 fi
 
+exit 0
+
 %post plugin
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
   %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so %{priority}
 
+exit 0
+
 %postun plugin
 if [ $1 -eq 0 ]
 then
@@ -716,6 +773,8 @@
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
 %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
 %ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
+%{_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*
@@ -726,6 +785,8 @@
 %{_mandir}/man1/servertool-%{name}.1*
 %{_mandir}/man1/tnameserv-%{name}.1*
 %{_mandir}/man1/unpack200-%{name}.1*
+%{_datadir}/pixmaps/javaws.png
+%{_datadir}/applications/javaws.desktop
 
 %files devel
 %defattr(-,root,root,-)
@@ -743,6 +804,7 @@
 %{_jvmdir}/%{sdkdir}/lib/*
 %{_jvmdir}/%{sdklnk}
 %{_jvmjardir}/%{sdklnk}
+%{_datadir}/applications/*jconsole.desktop
 %{_mandir}/man1/appletviewer-%{name}.1*
 %{_mandir}/man1/apt-%{name}.1*
 %{_mandir}/man1/extcheck-%{name}.1*
@@ -792,6 +854,21 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Apr 28 2008 Joshua Sumali <jsumali at redhat.com> - 1:1.6.0.0-0.10.b09
+- Added javaws menu entry.
+- Resolves: rhbz#443851
+
+* Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.10.b09
+- Updated release.
+- Updated icedteasnapshot.
+- Added jconsole and policy menu entries.
+- Removed all jhat references.
+- Resolves: rhbz#435235
+- Resolves: rhbz#417501
+- Resolves: rhbz#437418
+- Resolves: rhbz#443360
+- Resolves: rhbz#304031
+
 * Thu Apr 18 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.9.b09
 - Updated icedteaver.
 - Updated icedteasnapshot. 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	18 Apr 2008 14:36:40 -0000	1.17
+++ sources	28 Apr 2008 14:26:51 -0000	1.18
@@ -1,6 +1,5 @@
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 11d8e6129f27792cc1b0e1a7de2ec127  java-access-bridge-1.22.0.tar.gz
 079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz
-a94e67f3182d49902572153fa86f774e  openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
-e331dac6f1f2aec30b09876e81c2f6ae  icedtea6-1.2-7a015d5c9cb132abefb7f500852b3fef2ba7615d.tar.gz
 ad07a6bf24f81f49b4a8abef03676dd6  openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
+f0dc22fdc707f4ef5ff6b1ee113ac6a1  icedtea6-1.2-0bdd2917dfdb672402a7868206fd4ce9b2690a8c.tar.gz

More information about the fedora-extras-commits mailing list