# HG changeset patch
# User Jiri Vanek <jvanek@redhat.com>
# Date 1328899017 -3600
# Node ID dcb5503e60f74ed7529cb9c67c0dee8ed1849d43
# Parent  f096a649346318d583ef0ef196dd921aebefef21
backported 580478 patch

diff -r f096a6493463 -r dcb5503e60f7 ChangeLog
--- a/ChangeLog	Thu Jan 12 13:04:39 2012 +0000
+++ b/ChangeLog	Fri Feb 10 19:36:57 2012 +0100
@@ -1,3 +1,16 @@
+2012-01-25  Jiri Vanek  <jvanek@redhat.com>
+
+	fixes rhbz#580478
+	* configure.ac: abs-install-dir block moved outside conditional ENABLE_SYSTEMTAP block
+	 Added policytool.desktop and jconsole.desktop as AC_CONFIG_FILES
+	* jconsole.desktop:  removed, replaced by jconsole.desktop.in
+	* jconsole.desktop.in: new file, stub for desktop file, have variable
+	to be substituted during configure
+	* policytool.desktop:  removed, replaced by policytool.desktop.in
+	* policytool.desktop.in: new file, stub for desktop file, have variable
+	to be substituted during configure
+	* NEWS:  updated 
+
 2012-01-12  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS: Add 1.8.13.
diff -r f096a6493463 -r dcb5503e60f7 NEWS
--- a/NEWS	Thu Jan 12 13:04:39 2012 +0000
+++ b/NEWS	Fri Feb 10 19:36:57 2012 +0100
@@ -10,6 +10,9 @@
 
 New in release 1.8.13 (XXXX-XX-XX):
 
+* Bug fixes
+  - RH580478: Desktop files should not use hardcoded path
+
 New in release 1.8.12 (2012-01-11):
 
 * Backports
diff -r f096a6493463 -r dcb5503e60f7 configure.ac
--- a/configure.ac	Thu Jan 12 13:04:39 2012 +0000
+++ b/configure.ac	Fri Feb 10 19:36:57 2012 +0100
@@ -192,6 +192,7 @@
   AC_CONFIG_FILES([javac], [chmod +x javac])
   AC_CONFIG_FILES([javap], [chmod +x javap])
 fi
+
 FIND_RHINO_JAR
 WITH_OPENJDK_SRC_ZIP
 WITH_HOTSPOT_SRC_ZIP
@@ -296,6 +297,21 @@
   fi
 fi
 
+AC_MSG_CHECKING([for absolute java home install dir])
+AC_ARG_WITH([abs-install-dir],
+	    [AS_HELP_STRING([--with-abs-install-dir], 
+			    [The absolute path where the j2sdk-image dir will be installed])],
+	    [if test "x${withval}" = x; then
+		ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"
+	     else
+		ABS_JAVA_HOME_DIR="${withval}"
+	     fi], [ABS_JAVA_HOME_DIR="${abs_top_builddir}/${OPENJDK_BUILD_DIR}/j2sdk-image"])
+AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}])
+AC_SUBST(ABS_JAVA_HOME_DIR)
+
+AC_CONFIG_FILES([jconsole.desktop])
+AC_CONFIG_FILES([policytool.desktop])
+
 if test "x${ENABLE_SYSTEMTAP}" = xyes; then
 AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'],
                 [SDT_H_FOUND='no';
@@ -337,19 +353,8 @@
 ]])], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([systemtap sdt.h or g++ too old])])
   AC_LANG_POP([C++])
 
-  AC_MSG_CHECKING([for absolute java home install dir])
-  AC_ARG_WITH([abs-install-dir],
-	      [AS_HELP_STRING([--with-abs-install-dir], 
-			      [The absolute path where the j2sdk-image dir will be installed])],
-	      [if test "x${withval}" = x; then
-		 ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image"
-	       else
-		 ABS_JAVA_HOME_DIR="${withval}"
-	       fi], [ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image"])
-  AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}])
   ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so"
   ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"
-  AC_SUBST(ABS_JAVA_HOME_DIR)
   AC_SUBST(ABS_CLIENT_LIBJVM_SO)
   AC_SUBST(ABS_SERVER_LIBJVM_SO)
   AC_CONFIG_FILES([tapset/hotspot.stp])
diff -r f096a6493463 -r dcb5503e60f7 jconsole.desktop
--- a/jconsole.desktop	Thu Jan 12 13:04:39 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Monitoring & Management Console
-Comment=Monitor and manage OpenJDK applications
-Exec=/usr/bin/jconsole
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
-Version=1.0
diff -r f096a6493463 -r dcb5503e60f7 jconsole.desktop.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jconsole.desktop.in	Fri Feb 10 19:36:57 2012 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK Monitoring & Management Console
+Comment=Monitor and manage OpenJDK applications
+Exec=@ABS_JAVA_HOME_DIR@/bin/jconsole
+Icon=java
+Terminal=false
+Type=Application
+StartupWMClass=sun-tools-jconsole-JConsole
+Categories=Development;Monitor;Java;
+Version=1.0
diff -r f096a6493463 -r dcb5503e60f7 policytool.desktop
--- a/policytool.desktop	Thu Jan 12 13:04:39 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Policy Tool
-Comment=Manage OpenJDK policy files
-Exec=/usr/bin/policytool
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
-Version=1.0
diff -r f096a6493463 -r dcb5503e60f7 policytool.desktop.in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/policytool.desktop.in	Fri Feb 10 19:36:57 2012 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK Policy Tool
+Comment=Manage OpenJDK policy files
+Exec=@ABS_JAVA_HOME_DIR@/bin/policytool
+Icon=java
+Terminal=false
+Type=Application
+StartupWMClass=sun-security-tools-PolicyTool
+Categories=Development;Java;
+Version=1.