[icedtea-web/f16] - Added patch to allow install to jre dir - Fixed requirement for java-1.7.0-openjdk
Deepak Bhole
dbhole at fedoraproject.org
Tue Aug 23 21:23:09 UTC 2011
commit 1eb34572d6cd897bc1446a000abb8b4ad74df8c2
Author: Deepak Bhole <dbhole at redhat.com>
Date: Tue Aug 23 17:22:35 2011 -0400
- Added patch to allow install to jre dir
- Fixed requirement for java-1.7.0-openjdk
icedtea-web-1.1.1-JRE-install.patch | 118 +++++++++++++++++++++++++++++++++++
icedtea-web.spec | 15 ++++-
2 files changed, 131 insertions(+), 2 deletions(-)
---
diff --git a/icedtea-web-1.1.1-JRE-install.patch b/icedtea-web-1.1.1-JRE-install.patch
new file mode 100644
index 0000000..0492aa1
--- /dev/null
+++ b/icedtea-web-1.1.1-JRE-install.patch
@@ -0,0 +1,118 @@
+
+# HG changeset patch
+# User Omair Majid <omajid at redhat.com>
+# Date 1314118330 14400
+# Node ID 25dc7d8cb7573157a8d7554ac48a095cf34707f8
+# Parent db6914cf15be530c8dd3624cc407c53d538816f9
+Allow icedtea-web to run with just a JRE
+
+2011-08-23 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am: Remove JRE. Replace uses with SYSTEM_JRE_DIR instead. Also
+ replace uses of SYSTEM_JDK_DIR/jre with SYSTEM_JRE_DIR.
+ * acinclude.m4
+ (IT_CHECK_FOR_JRE): New macro.
+ (IT_FIND_JAVA): Require IT_CHECK_FOR_JRE. Use java binary from within the
+ JRE.
+
+diff -r db6914cf15be -r 25dc7d8cb757 Makefile.am
+--- a/Makefile.am Wed Aug 03 14:11:11 2011 -0400
++++ b/Makefile.am Tue Aug 23 12:52:10 2011 -0400
+@@ -43,7 +43,6 @@
+ # IllegalAccessException
+ # - we want full privileges
+ #
+-JRE='"$(SYSTEM_JDK_DIR)/jre"'
+ LAUNCHER_BOOTCLASSPATH="-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar$(RHINO_RUNTIME)"
+ PLUGIN_BOOTCLASSPATH='"-Xbootclasspath/a:$(datadir)/$(PACKAGE_NAME)/netx.jar:$(datadir)/$(PACKAGE_NAME)/plugin.jar$(RHINO_RUNTIME)"'
+
+@@ -120,7 +119,7 @@
+ -e 's|[@]JAVAWS_BIN_LOCATION[@]|$(bindir)/$(javaws)|g' \
+ -e 's|[@]ITWEB_SETTINGS_BIN_LOCATION[@]|$(bindir)/$(itweb_settings)|g' \
+ -e 's|[@]JAVA[@]|$(JAVA)|g' \
+- -e 's|[@]JRE[@]|$(JRE)|g'
++ -e 's|[@]JRE[@]|$(SYSTEM_JRE_DIR)|g'
+
+ # Top-Level Targets
+ # =================
+@@ -208,7 +207,7 @@
+ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
+ -DPACKAGE_URL="\"$(PACKAGE_URL)\"" \
+ -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
+- -DICEDTEA_WEB_JRE=$(JRE) \
++ -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
+ -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+@@ -530,13 +529,13 @@
+ ln -sf $(abs_top_builddir)/javac $(BOOT_DIR)/bin/javac
+ ln -sf $(JAVADOC) $(BOOT_DIR)/bin/javadoc
+ mkdir -p $(BOOT_DIR)/jre/lib && \
+- ln -s $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(BOOT_DIR)/jre/lib && \
+- if [ -e $(SYSTEM_JDK_DIR)/jre/lib/jsse.jar ] ; then \
+- ln -s $(SYSTEM_JDK_DIR)/jre/lib/jsse.jar $(BOOT_DIR)/jre/lib ; \
++ ln -s $(SYSTEM_JRE_DIR)/lib/rt.jar $(BOOT_DIR)/jre/lib && \
++ if [ -e $(SYSTEM_JRE_DIR)/lib/jsse.jar ] ; then \
++ ln -s $(SYSTEM_JRE_DIR)/lib/jsse.jar $(BOOT_DIR)/jre/lib ; \
+ else \
+ ln -s rt.jar $(BOOT_DIR)/jre/lib/jsse.jar ; \
+ fi
+- ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
++ ln -sf $(SYSTEM_JRE_DIR)/lib/$(JRE_ARCH_DIR) \
+ $(BOOT_DIR)/jre/lib/ && \
+ if ! test -d $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \
+ then \
+diff -r db6914cf15be -r 25dc7d8cb757 acinclude.m4
+--- a/acinclude.m4 Wed Aug 03 14:11:11 2011 -0400
++++ b/acinclude.m4 Tue Aug 23 12:52:10 2011 -0400
+@@ -64,6 +64,32 @@
+ AC_SUBST(SYSTEM_JDK_DIR)
+ ])
+
++AC_DEFUN_ONCE([IT_CHECK_FOR_JRE],
++[
++ AC_REQUIRE([IT_CHECK_FOR_JDK])
++ AC_MSG_CHECKING([for a JRE home directory])
++ AC_ARG_WITH([jre-home],
++ [AS_HELP_STRING([--with-jre-home],
++ [jre home directory \
++ (default is the JRE under the JDK)])],
++ [
++ SYSTEM_JRE_DIR=${withval}
++ ],
++ [
++ SYSTEM_JRE_DIR=
++ ])
++ if test -z "${SYSTEM_JRE_DIR}" ; then
++ if test -d "${SYSTEM_JDK_DIR}/jre" ; then
++ SYSTEM_JRE_DIR="${SYSTEM_JDK_DIR}/jre"
++ fi
++ fi
++ AC_MSG_RESULT(${SYSTEM_JRE_DIR})
++ if ! test -d "${SYSTEM_JRE_DIR}"; then
++ AC_MSG_ERROR("A JRE home directory could not be found.")
++ fi
++ AC_SUBST(SYSTEM_JRE_DIR)
++])
++
+ AC_DEFUN_ONCE([FIND_JAVAC],
+ [
+ AC_REQUIRE([IT_CHECK_FOR_JDK])
+@@ -592,6 +618,7 @@
+
+ AC_DEFUN_ONCE([IT_FIND_JAVA],
+ [
++ AC_REQUIRE([IT_CHECK_FOR_JRE])
+ AC_MSG_CHECKING([for a Java virtual machine])
+ AC_ARG_WITH([java],
+ [AS_HELP_STRING(--with-java,specify location of the 1.5 java vm)],
+@@ -599,7 +626,7 @@
+ JAVA="${withval}"
+ ],
+ [
+- JAVA=${SYSTEM_JDK_DIR}/bin/java
++ JAVA="${SYSTEM_JRE_DIR}/bin/java"
+ ])
+ if ! test -f "${JAVA}"; then
+ AC_PATH_PROG(JAVA, "${JAVA}")
+
diff --git a/icedtea-web.spec b/icedtea-web.spec
index 63acaf2..c90aa56 100644
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@ -41,7 +41,7 @@
Name: icedtea-web
Version: 1.1.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Additional Java components for OpenJDK
Group: Applications/Internet
@@ -55,6 +55,10 @@ Patch0: icedtea-web-1.1.1-PR768.patch
# Fix PR769: IcedTea-Web plugin does not work with some ssl sites with OpenJDK7
Patch1: icedtea-web-1.1.1-PR769.patch
+# Allow icedtea-web to work with JRE only
+# http://icedtea.classpath.org/hg/release/icedtea-web-1.1/raw-rev/25dc7d8cb757
+Patch2: %{name}-%{version}-JRE-install.patch
+
BuildRequires: java-1.7.0-openjdk-devel
BuildRequires: desktop-file-utils
BuildRequires: gecko-devel
@@ -63,7 +67,7 @@ BuildRequires: gtk2-devel
BuildRequires: xulrunner-devel
# For functionality and the OpenJDK dirs
-Requires: java-1.6.0-openjdk >= %{min_openjdk_version}
+Requires: java-%{javaver}-openjdk
# For the mozilla plugin dir
Requires: mozilla-filesystem%{?_isa}
@@ -102,12 +106,15 @@ This package contains Javadocs for the IcedTea-Web project.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
+autoconf
./configure \
--with-pkgversion=fedora-%{release}-%{_arch} \
--docdir=%{_datadir}/javadoc/%{name} \
--with-jdk-home=%{javadir} \
+ --with-jre-home=%{jredir} \
--libdir=%{_libdir} \
--program-suffix=%{binsuffix} \
--prefix=%{_prefix}
@@ -173,6 +180,10 @@ exit 0
%doc COPYING
%changelog
+* Tue Aug 23 2011 Deepak Bhole <dbhole at redhat.com> 1.1.1-3
+- Added patch to allow install to jre dir
+- Fixed requirement for java-1.7.0-openjdk
+
* Tue Aug 09 2011 Deepak Bhole <dbhole at redhat.com> 1.1.1-2
- Fixed file ownership so that debuginfo is not in main package
More information about the scm-commits
mailing list