Mercurial > hg > release > icedtea7-2.6

--- a/ChangeLog	Sat Dec 29 06:06:32 2018 +0000
+++ b/ChangeLog	Sun Dec 30 06:39:01 2018 +0000
@@ -1,3 +1,41 @@
+2018-09-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR3657: Sync desktop files with Fedora/RHEL
+	versions again
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Moved to acinclude.m4.
+	(BUILD_VERSION): Likewise.
+	(COMBINED_VERSION): Likewise.
+	(ICEDTEA_ENV): Use substitution for
+	JRE_RELEASE_VERSION, JDK_UPDATE_VERSION
+	and BUILD_VERSION.
+	(dist-openjdk): Use substitution for
+	COMBINED_VERSION.
+	(dist-openjdk-fsg): Likewise.
+	(dist-openjdk-fsg-xz): Likewise.
+	(install-data-local): Include JAVA_VENDOR
+	in icon name.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DETERMINE_VERSION): Define JAVA_VENDOR,
+	JDK_UPDATE_VERSION, BUILD_VERSION, COMBINED_VERSION
+	and OPENJDK_VER here. Include OPENJDK_VER in output.
+	* jconsole.desktop.in:
+	Add full version and target architecture to name
+	to distinguish between multiple installations for the
+	same major Java version.  Add JAVA_VENDOR ('openjdk')
+	to the icon name.
+	* policytool.desktop.in: Likewise.
+
+2013-12-26  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	PR3657: Sync desktop files with Fedora/RHEL
+	versions again
+	* configure.ac:
+	Add AC_CANONICAL_TARGET after AC_CANONICAL_HOST
+	and move earlier in file, before Automake
+	initialisation.
+
 2018-12-28  Andrew John Hughes  <gnu_andrew@member.fsf.org>

 	Bump to 2.6.15.
--- a/Makefile.am	Sat Dec 29 06:06:32 2018 +0000
+++ b/Makefile.am	Sun Dec 30 06:39:01 2018 +0000
@@ -1,9 +1,5 @@
 # Dependencies

-JDK_UPDATE_VERSION = 191
-BUILD_VERSION = b02
-COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-
 CORBA_CHANGESET = 9b8ff44cf2c6
 JAXP_CHANGESET = 5dc90bd920db
 JAXWS_CHANGESET = a88988c07020
@@ -591,9 +587,9 @@
 ICEDTEA_ENV = \
 	ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
 	ANT="$(ANT)" \
-        BUILD_NUMBER="$(BUILD_VERSION)" \
-	JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
-        JRE_RELEASE_VERSION="@JAVA_VER@_$(COMBINED_VERSION)" \
+        BUILD_NUMBER="@BUILD_VERSION@" \
+	JDK_UPDATE_VERSION="@JDK_UPDATE_VERSION@" \
+        JRE_RELEASE_VERSION="@JAVA_VER@_@COMBINED_VERSION@" \
 	MILESTONE="fcs" \
 	LANG="C" \
 	PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
@@ -1019,15 +1015,15 @@
 # Creates archive of openjdk.
 dist-openjdk: stamps/extract-cacao.stamp
 	find openjdk/ -name \\.hg* | xargs rm -rf
-	$(ZIP) -r openjdk-$(COMBINED_VERSION) openjdk/
+	$(ZIP) -r openjdk-@COMBINED_VERSION@ openjdk/

 # Creates archive of openjdk that is compliant with Free Software guidelines.
 dist-openjdk-fsg: stamps/patch-fsg.stamp
-	$(ZIP) -r openjdk-fsg-$(COMBINED_VERSION) openjdk/
+	$(ZIP) -r openjdk-fsg-@COMBINED_VERSION@ openjdk/

 dist-openjdk-fsg-xz: stamps/patch-fsg.stamp
 	tardir=openjdk/ && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c \
-	  >openjdk-fsg-$(COMBINED_VERSION).tar.xz
+	  >openjdk-fsg-@COMBINED_VERSION@.tar.xz

 # OpenJDK Source Preparation Targets
 # ==================================
@@ -3373,7 +3369,7 @@
 	for sizes in 16 24 32 48 ; do \
 	  ${mkinstalldirs} $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps ; \
 	  ${INSTALL_DATA} openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon$${sizes}.png \
-	    $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-@JAVA_VER@.png ; \
+	    $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-@JAVA_VER@-@JAVA_VENDOR@.png ; \
 	done
 	for files in $(DESKTOP_FILES) ; do \
 	  ${INSTALL_DATA} $(builddir)/$${files} $(DESTDIR)$(datadir)/applications ; \
--- a/NEWS	Sat Dec 29 06:06:32 2018 +0000
+++ b/NEWS	Sun Dec 30 06:39:01 2018 +0000
@@ -23,6 +23,8 @@
   - S8200666, CVE-2018-2973: Improve LDAP support
   - PR3608, CVE-2018-3639 hw: cpu: speculative store bypass mitigation
 * New features
+  - PR3629: Install symlinks to tapsets in SystemTap directory
+  - PR3657: Sync desktop files with Fedora/RHEL versions again
   - PR3659: Support RHEL multilib installations which use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming
 * Import of OpenJDK 7 u191 build 2
   - S8005661: [parfait] Possible buffer overrun in jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
@@ -2072,8 +2074,6 @@

 New in release 2.5.2 (2014-08-29):

-* New features
-  - PR3629: Install symlinks to tapsets in SystemTap directory
 * Backports
   - S8049480: Current versions of Java can't verify jars signed and timestamped with Java 9
   - S8051012, LP1360392: Regression in verifier for <init> method call from inside of a branch
--- a/acinclude.m4	Sat Dec 29 06:06:32 2018 +0000
+++ b/acinclude.m4	Sun Dec 30 06:39:01 2018 +0000
@@ -2951,10 +2951,20 @@
 [
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
   JAVA_VER=1.7.0
+  JAVA_VENDOR=openjdk
+  JDK_UPDATE_VERSION=191
+  BUILD_VERSION=b02
+  COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION}
+  OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION}
   ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##')
   ICEDTEA_BRANCH=$(echo ${ICEDTEA_RELEASE}|sed 's|\.[[0-9]]$||')
-  AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE} for OpenJDK ${JAVA_VER}])
+  AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE} for OpenJDK ${OPENJDK_VER}])
   AC_SUBST([JAVA_VER])
+  AC_SUBST([JAVA_VENDOR])
+  AC_SUBST([JDK_UPDATE_VERSION])
+  AC_SUBST([BUILD_VERSION])
+  AC_SUBST([COMBINED_VERSION])
+  AC_SUBST([OPENJDK_VER])
   AC_SUBST([ICEDTEA_RELEASE])
   AC_SUBST([ICEDTEA_BRANCH])
 ])
--- a/configure.ac	Sat Dec 29 06:06:32 2018 +0000
+++ b/configure.ac	Sun Dec 30 06:39:01 2018 +0000
@@ -1,4 +1,6 @@
 AC_INIT([icedtea], [2.6.15], [distro-pkg-dev@openjdk.java.net])
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -17,8 +19,6 @@
 AC_CONFIG_FILES([jconsole.desktop])
 AC_CONFIG_FILES([policytool.desktop])

-AC_CANONICAL_HOST
-
 AC_PROG_CC
 AC_PROG_CXX
--- a/jconsole.desktop.in	Sat Dec 29 06:06:32 2018 +0000
+++ b/jconsole.desktop.in	Sun Dec 30 06:39:01 2018 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
+Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Monitoring & Management Console
 Comment=Monitor and manage OpenJDK applications
 Exec=_BINDIR_/jconsole
-Icon=java-@JAVA_VER@
+Icon=java-@JAVA_VER@-@JAVA_VENDOR@
 Terminal=false
 Type=Application
 StartupWMClass=sun-tools-jconsole-JConsole
--- a/policytool.desktop.in	Sat Dec 29 06:06:32 2018 +0000
+++ b/policytool.desktop.in	Sun Dec 30 06:39:01 2018 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=OpenJDK @JAVA_VER@ Policy Tool
+Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Policy Tool
 Comment=Manage OpenJDK policy files
 Exec=_BINDIR_/policytool
-Icon=java-@JAVA_VER@
+Icon=java-@JAVA_VER@-@JAVA_VENDOR@
 Terminal=false
 Type=Application
 StartupWMClass=sun-security-tools-PolicyTool