changeset 1618:0a04da4b4d6d

2009-02-08 Lillian Angel <langel@redhat.com> * Makefile.am: Updated sed to search for OpenJDK instead of IcedTea6. * patches/icedtea-version.patch: Changed PRODUCT_NAME from IcedTea6 to OpenJDK.
author Lillian Angel <langel@redhat.com>
date Sun, 08 Feb 2009 07:39:47 -0500
parents d31f7236fd89
children c402774cf211
files ChangeLog Makefile.am patches/icedtea-version.patch
diffstat 3 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 06 02:04:22 2009 +0000
+++ b/ChangeLog	Sun Feb 08 07:39:47 2009 -0500
@@ -1,3 +1,9 @@
+2009-02-08  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Updated sed to search for OpenJDK instead of IcedTea6. 
+	* patches/icedtea-version.patch: Changed PRODUCT_NAME from IcedTea6 to
+	OpenJDK.
+
 2009-02-05  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Fri Feb 06 02:04:22 2009 +0000
+++ b/Makefile.am	Sun Feb 08 07:39:47 2009 -0500
@@ -706,7 +706,7 @@
 	if [ -n "$(PKGVERSION)" ]; then \
 	  icedtea_version="$${icedtea_version} ($(PKGVERSION))" ; \
 	fi; \
-	sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
+	sed -i "s#OpenJDK#OpenJDK $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
 
 if ENABLE_PLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
--- a/patches/icedtea-version.patch	Fri Feb 06 02:04:22 2009 +0000
+++ b/patches/icedtea-version.patch	Sun Feb 08 07:39:47 2009 -0500
@@ -6,9 +6,8 @@
  # Default names
  ifdef OPENJDK
 -  LAUNCHER_NAME = openjdk
--  PRODUCT_NAME = OpenJDK
 +  LAUNCHER_NAME = java
-+  PRODUCT_NAME = IcedTea6
+   PRODUCT_NAME = OpenJDK
    PRODUCT_SUFFIX = Runtime Environment
    JDK_RC_PLATFORM_NAME = Platform
    COMPANY_NAME = N/A