[java-1.8.0-openjdk] Make zero jvm.cfg changes conditional on b89 tarball

Omair Majid omajid at fedoraproject.org
Wed Aug 7 14:11:29 UTC 2013


commit 2d787f6b9c45c3320e91aa35ef8a772a11337a60
Author: Omair Majid <omajid at redhat.com>
Date:   Wed Aug 7 10:11:20 2013 -0400

    Make zero jvm.cfg changes conditional on b89 tarball

 java-1.8.0-openjdk.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 8532306..f979e1f 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -400,9 +400,6 @@ sh %{SOURCE12}
 %patch203
 %endif
 
-pushd jdk8
-%patch310 -p1
-popd
 
 %patch1
 
@@ -432,6 +429,12 @@ pushd jdk8
 %patch306 -p1
 popd
 
+%else
+
+pushd jdk8
+%patch310 -p1
+popd
+
 %endif
 
 # Extract systemtap tapsets
@@ -974,6 +977,9 @@ exit 0
 %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE
 
 %changelog
+* Wed Aug 07 2013 Omair Majid <omajid at redhat.com> - 1:1.8.0.0-0.16.b89x
+- The zero fix only applies on b89 tarball
+
 * Tue Aug 06 2013 Omair Majid <omajid at redhat.com> - 1:1.8.0.0-0.16.b89x
 - Add patch to fix zero on 32-bit build
 


More information about the scm-commits mailing list