Attachment 308563 Details for Bug 450345 – Diffs for port to Fedora 9 operating system

Diffs for port to Fedora 9 operating system

diffs (text/plain), 4.77 KB, created by Matthew Harmsen on 2008-06-06 20:13:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Harmsen

Created: 2008-06-06 20:13:28 UTC

Size: 4.77 KB

patch

obsolete

>Index: pki/linux/console/pki-console.spec
>===================================================================
>--- pki/linux/console/pki-console.spec	(revision 49)
>+++ pki/linux/console/pki-console.spec	(working copy)
>@@ -96,9 +96,14 @@
> %define dist_prefix       .fc
> %define dist_version      %(echo `rpm -qf --qf='%{VERSION}' /etc/fedora-release` | tr -d [A-Za-z])
> %define dist              %{dist_prefix}%{dist_version}
>-%define openjdk           %(test %{dist_version} -ge 8 && echo 1 || echo 0)
>+%define openjdk           %(test %{dist_version} -eq 9 && echo 1 || echo 0)
> %if %{openjdk}
>-## redefine the JDK used to build on Fedora Linux
>+## redefine the JDK used to build on Fedora 9 Linux
>+%define pki_jdk           java-sdk >= 1.6.0
>+%endif
>+%define openjdk           %(test %{dist_version} -eq 8 && echo 1 || echo 0)
>+%if %{openjdk}
>+## redefine the JDK used to build on Fedora 8 Linux
> %define pki_jdk           java-sdk >= 1.7.0
> %endif
> %else
>Index: pki/linux/util/pki-util.spec
>===================================================================
>--- pki/linux/util/pki-util.spec	(revision 49)
>+++ pki/linux/util/pki-util.spec	(working copy)
>@@ -81,9 +81,14 @@
> %define dist_prefix       .fc
> %define dist_version      %(echo `rpm -qf --qf='%{VERSION}' /etc/fedora-release` | tr -d [A-Za-z])
> %define dist              %{dist_prefix}%{dist_version}
>-%define openjdk           %(test %{dist_version} -ge 8 && echo 1 || echo 0)
>+%define openjdk           %(test %{dist_version} -eq 9 && echo 1 || echo 0)
> %if %{openjdk}
>-## redefine the JDK used to build on Fedora Linux
>+## redefine the JDK used to build on Fedora 9 Linux
>+%define pki_jdk           java-sdk >= 1.6.0
>+%endif
>+%define openjdk           %(test %{dist_version} -eq 8 && echo 1 || echo 0)
>+%if %{openjdk}
>+## redefine the JDK used to build on Fedora 8 Linux
> %define pki_jdk           java-sdk >= 1.7.0
> %endif
> %else
>Index: pki/base/ca/shared/conf/dtomcat5
>===================================================================
>--- pki/base/ca/shared/conf/dtomcat5	(revision 49)
>+++ pki/base/ca/shared/conf/dtomcat5	(working copy)
>@@ -192,9 +192,10 @@
> # Set standard CLASSPATH
> # (always inherit any preset values from the PKI start script)
> if [ ${OS} = "Linux" ] ; then
>-	# Checking for IcedTea JVM
>-	ICEDTEA_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`"
>-	if	[ "${ICEDTEA_JVM}" = "IcedTea" ]; then
>+	# Checking for OpenJDK JVM
>+	OPENJDK_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`"
>+	if	[ "${OPENJDK_JVM}" = "OpenJDK" ] ||
>+		[ "${OPENJDK_JVM}" = "IcedTea" ]; then
> 		# using OpenJDK
> 		CLASSPATH="$CLASSPATH":"$JAVA_HOME"/lib/rt.jar
> 
>Index: pki/base/tks/shared/conf/dtomcat5
>===================================================================
>--- pki/base/tks/shared/conf/dtomcat5	(revision 49)
>+++ pki/base/tks/shared/conf/dtomcat5	(working copy)
>@@ -192,9 +192,10 @@
> # Set standard CLASSPATH
> # (always inherit any preset values from the PKI start script)
> if [ ${OS} = "Linux" ] ; then
>-	# Checking for IcedTea JVM
>-	ICEDTEA_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`"
>-	if	[ "${ICEDTEA_JVM}" = "IcedTea" ]; then
>+	# Checking for OpenJDK JVM
>+	OPENJDK_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`"
>+	if	[ "${OPENJDK_JVM}" = "OpenJDK" ] ||
>+		[ "${OPENJDK_JVM}" = "IcedTea" ]; then
> 		# using OpenJDK
> 		CLASSPATH="$CLASSPATH":"$JAVA_HOME"/lib/rt.jar
> 
>Index: pki/base/ocsp/shared/conf/dtomcat5
>===================================================================
>--- pki/base/ocsp/shared/conf/dtomcat5	(revision 49)
>+++ pki/base/ocsp/shared/conf/dtomcat5	(working copy)
>@@ -192,9 +192,10 @@
> # Set standard CLASSPATH
> # (always inherit any preset values from the PKI start script)
> if [ ${OS} = "Linux" ] ; then
>-	# Checking for IcedTea JVM
>-	ICEDTEA_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`"
>-	if	[ "${ICEDTEA_JVM}" = "IcedTea" ]; then
>+	# Checking for OpenJDK JVM
>+	OPENJDK_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`"
>+	if	[ "${OPENJDK_JVM}" = "OpenJDK" ] ||
>+		[ "${OPENJDK_JVM}" = "IcedTea" ]; then
> 		# using OpenJDK
> 		CLASSPATH="$CLASSPATH":"$JAVA_HOME"/lib/rt.jar
> 
>Index: pki/base/kra/shared/conf/dtomcat5
>===================================================================
>--- pki/base/kra/shared/conf/dtomcat5	(revision 49)
>+++ pki/base/kra/shared/conf/dtomcat5	(working copy)
>@@ -192,9 +192,10 @@
> # Set standard CLASSPATH
> # (always inherit any preset values from the PKI start script)
> if [ ${OS} = "Linux" ] ; then
>-	# Checking for IcedTea JVM
>-	ICEDTEA_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`"
>-	if	[ "${ICEDTEA_JVM}" = "IcedTea" ]; then
>+	# Checking for OpenJDK JVM
>+	OPENJDK_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`"
>+	if	[ "${OPENJDK_JVM}" = "OpenJDK" ] ||
>+		[ "${OPENJDK_JVM}" = "IcedTea" ]; then
> 		# using OpenJDK
> 		CLASSPATH="$CLASSPATH":"$JAVA_HOME"/lib/rt.jar
>

Actions: View

Attachments on bug 450345: 308563 | 308721