Attachment 948839 Details for Bug 1149605 – Proposed patch

[patch] Proposed patch

mizdebsk_rhbz1149605.patch (text/plain), 3.69 KB, created by Mikolaj Izdebski on 2014-10-21 08:14:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2014-10-21 08:14:06 UTC

Size: 3.69 KB

patch

obsolete

>From 4a7e942c8d8a0a3bd01adaafd95c1f8c66a45030 Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Thu, 11 Jul 2013 14:52:28 +0200
>Subject: [PATCH] Add support for OpenJDK 8
>
>- Resolves: rhbz#1149605
>---
> jpackage-utils-openjdk-8.patch | 28 ++++++++++++++++++++++++++++
> jpackage-utils.spec            | 13 ++++++++++---
> 2 files changed, 38 insertions(+), 3 deletions(-)
> create mode 100644 jpackage-utils-openjdk-8.patch
>
>diff --git a/jpackage-utils-openjdk-8.patch b/jpackage-utils-openjdk-8.patch
>new file mode 100644
>index 0000000..7a3ca35
>--- /dev/null
>+++ b/jpackage-utils-openjdk-8.patch
>@@ -0,0 +1,28 @@
>+From 494fea0d6c628fb0e56a8f20c7f629c4dceb2e55 Mon Sep 17 00:00:00 2001
>+From: Mikolaj Izdebski <mizdebsk@redhat.com>
>+Date: Thu, 11 Jul 2013 14:47:05 +0200
>+Subject: [PATCH] Add support for OpenJDK 8
>+
>+Patch provided by Florian Weimer in rhbz#982683
>+---
>+ java-utils/java-functions | 4 ++--
>+ 1 file changed, 2 insertions(+), 2 deletions(-)
>+
>+diff --git a/java-utils/java-functions b/java-utils/java-functions
>+index 41b470c..5bda299 100644
>+--- a/java-utils/java-functions
>++++ b/java-utils/java-functions
>+@@ -169,8 +169,8 @@ set_jvm_dirs() {
>+         # Yuck, "grep -o" would be cleaner, but requires GNU grep >= 2.5.
>+         # This could be improved/simplified if sed had non-greedy matching.
>+         JAVA_VERSION=$($JAVACMD $opt 2>&1 | sed -n \
>+-            -e '/java $full $*version "/s/'$re'/<<<\1>>>/' \
>+-            -e '/java $full $*version "/s/.*<<<$[^>]\{1,\}$>>>.*/\1/p')
>++            -e '/$openjdk\|java$ $full $*version "/s/'$re'/<<<\1>>>/' \
>++            -e '/$openjdk\|java$ $full $*version "/s/.*<<<$[^>]\{1,\}$>>>.*/\1/p')
>+         if [ -n "$JAVA_VERSION" ] ; then
>+             break
>+         fi
>+-- 
>+1.8.1.4
>+
>diff --git a/jpackage-utils.spec b/jpackage-utils.spec
>index 5410eea..e5b1996 100644
>--- a/jpackage-utils.spec
>+++ b/jpackage-utils.spec
>@@ -34,7 +34,7 @@
> 
> Name:           jpackage-utils
> Version:        1.7.5
>-Release:        3.12%{?dist}
>+Release:        3.13%{?dist}
> Epoch:          0
> Summary:        JPackage utilities
> License:        BSD
>@@ -46,6 +46,8 @@ Source0:        %{name}-%{version}.tar.bz2
> Source1:        %{name}-README
> Patch0:         %{name}-enable-gcj-support.patch
> Patch1:         %{name}-own-mavendirs.patch
>+# Backported from javapackages commit 494fea0
>+Patch7:         %{name}-openjdk-8.patch
> Group:          Utilities
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
> 
>@@ -66,6 +68,7 @@ information.
> %setup -q
> %patch0 -p0
> %patch1 -p1
>+%patch7 -p1
> 
> cp %{SOURCE1} .
> 
>@@ -108,11 +111,11 @@ install -dm 755 ${RPM_BUILD_ROOT}${_javadir}
> install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-utils
> install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-ext
> install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.3.1,1.4.0,1.4.1,1.4.2}
>-install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.5.0,1.6.0,1.7.0}
>+install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.5.0,1.6.0,1.7.0,1.8.0}
> install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
> install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-ext
> install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.3.1,1.4.0,1.4.1,1.4.2}
>-install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0}
>+install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0,1.8.0}
> install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir}
> install -dm 755 ${RPM_BUILD_ROOT}${_mavenpomdir}
> install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapfragdir}
>@@ -207,6 +210,10 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Tue Oct 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7.5-3.13
>+- Add support for OpenJDK 8
>+- Resolves: rhbz#1149605
>+
> * Mon May 17 2010 Deepak Bhole <dbhole@redhat.com>  - 0:1.7.5-3.12
> - Resolve rhbz#593071: Add requirement on findutils
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1149605: 948839