[java-1.7.0-openjdk/f18] Fix mistake in applying patches

Omair Majid omajid at fedoraproject.org
Mon Aug 26 14:29:09 UTC 2013


commit 502134ea8de5296defb685e6193517ade90e79df
Author: Omair Majid <omajid at redhat.com>
Date:   Mon Aug 26 10:28:57 2013 -0400

    Fix mistake in applying patches

 java-1.7.0-openjdk.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index aa31ae3..173832d 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -159,7 +159,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: %{icedtea_version}.2%{?dist}
+Release: %{icedtea_version}.3%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -680,13 +680,13 @@ cp -a openjdk openjdk-boot
 %patch235
 %patch236
 
+%endif
+
 %patch501
 %patch502
 %patch503
 %patch504
 
-%endif
-
 %build
 # How many cpu's do we have?
 export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
@@ -1428,6 +1428,9 @@ exit 0
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 
 %changelog
+* Mon Aug 26 2013 Omair Majid <omajid at redhat.com> - 1.7.0.23-2.3.12.3.f18
+- getCallerClass patches should be applied unconditionally.
+
 * Tue Aug 20 2013 Omair Majid <omajid at redhat.com> - 1.7.0.23-2.3.12.2.f18
 - Backport getCallerClass related patches from upstream that are not in a release yet
 


More information about the scm-commits mailing list