[java-1.7.0-openjdk] updated to icedtea7-forest 2.5.0 - removed icedtea_version_presuffix - removed hardcoded 60 - remove

[jiri vanek]

commit 0f2262c6c473da3cd0005a50b9afa81e7b4b8797
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Wed Jun 18 14:33:34 2014 +0200

    updated to icedtea7-forest 2.5.0
    - removed icedtea_version_presuffix
    - removed hardcoded 60
    - removed upstreamed patch412 add-final-location-rpaths.patch
    - removed upstreamed patch413 rh1064383-prelink_fix.patch

 .gitignore                      |    1 +
 add-final-location-rpaths.patch |   49 ------------------------
 java-1.7.0-openjdk.spec         |   29 +++++++-------
 rh1064383-prelink_fix.patch     |   79 ---------------------------------------
 sources                         |    2 +-
 5 files changed, 16 insertions(+), 144 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d264e4b..aaa1ae1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /systemtap-tapset-2014-03-19.tar.xz
 /openjdk-icedtea-2.5pre04.tar.xz
 /aarch64-port-jdk7u60-b04-aarch64-832.tar.xz
+/openjdk-icedtea-2.5.0.tar.xz
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index d85beab..3813cba 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,8 +1,7 @@
 # If debug is 1, OpenJDK is built with all debug info present.
 %global debug 0
 
-%global icedtea_version_presuffix pre04
-%global icedtea_version 2.5
+%global icedtea_version 2.5.0
 %global hg_tag icedtea-{icedtea_version}
 
 %global aarch64_release 832
@@ -121,10 +120,9 @@
 
 # Standard JPackage naming and versioning defines.
 %global origin          openjdk
-%global updatever       55
+%global updatever       60
 %global aarch64_updatever 60
-#Fedora have an bogus 60 instead of updatever. Fix when updatever>=60 in version:
-%global buildver        13
+%global buildver        30
 %global aarch64_buildver 04
 # Keep priority on 6digits in case updatever>9
 %global priority        1700%{updatever}
@@ -168,8 +166,8 @@
 %global __jar_repack 0
 
 Name:    java-%{javaver}-%{origin}
-Version: %{javaver}.60
-Release: %{icedtea_version}.0.22.%{icedtea_version_presuffix}%{?dist}.1
+Version: %{javaver}.%{updatever}
+Release: %{icedtea_version}.0%{?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
@@ -202,7 +200,7 @@ URL:      http://openjdk.java.net/
 # find openjdk -name ".hg" -exec rm -rf '{}' \;
 # sh /git/java-1.7.0-openjdk/fX/fsg.sh
 # tar cJf openjdk-icedtea-%{icedtea_version}.tar.xz openjdk
-Source0:  openjdk-icedtea-%{icedtea_version}%{icedtea_version_presuffix}.tar.xz
+Source0:  openjdk-icedtea-%{icedtea_version}.tar.xz
 Source1:  aarch64-port-jdk7u%{aarch64_updatever}-b%{aarch64_buildver}-aarch64-%{aarch64_release}.tar.xz
 
 # README file
@@ -288,12 +286,9 @@ Patch300: pulse-soundproperties.patch
 Patch403: PStack-808293.patch
 Patch4030: PStack-808293-aarch64.patch
 # Add hardcoded RPATHS to ELF files
-Patch412: add-final-location-rpaths.patch
 Patch4120: add-final-location-rpaths-aarch64.patch
 # End of tmp patches
 
-# Temporary copy of RH1064383 fix; remove after release of 2.4.8
-Patch413: rh1064383-prelink_fix.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -584,11 +579,8 @@ tar xzf %{SOURCE9}
 
 %ifarch %{aarch64}
 %patch4120
-%else
-%patch412
 %endif
 
-%patch413
 
 %build
 # How many cpu's do we have?
@@ -1573,6 +1565,13 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/accessibility.properties
 
 %changelog
+* Wed Jun 18 2014 Jiri Vanek  <jvanek at redhat.com> - 1.7.0.60-2.5.0.f21
+- updated to icedtea7-forest 2.5.0
+- removed icedtea_version_presuffix
+- removed hardcoded 60
+- removed upstreamed patch412 add-final-location-rpaths.patch
+- removed upstreamed patch413 rh1064383-prelink_fix.patch
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.7.0.60-2.5.0.22.pre04.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -1598,7 +1597,7 @@ exit 0
 - debug turned on (1)
 - added   JAVAC_WARNINGS_FATAl="false"  tomakefile options
 
-* Thu Apr 22 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.51-2.5.0.18.pre04.f21
+* Tue Apr 22 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.51-2.5.0.18.pre04.f21
 - Added Omair's fix for RH1059925
  - added and used Source14, remove-origin-from-rpaths
  - added and applied patch412 add-final-location-rpaths.patch
diff --git a/sources b/sources
index ddba0be..ed50f96 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 ea344cc5b53b73f375558ba41760ff64  class-rewriter.tar.gz
-7f72e72d85f3ab5e3f36719a17e132ec  openjdk-icedtea-2.5pre04.tar.xz
+0ec4aa81608dc91aedd40650f13c8f70  openjdk-icedtea-2.5.0.tar.xz
 1cb61996cf5dbe80827abbe7d009bf28  pulseaudio.tar.gz
 013ddff65e090aafe9ff89d4ce767e8d  systemtap-tapset-2014-03-19.tar.xz
 5fa84f6769117e1f582c779d888af468  aarch64-port-jdk7u60-b04-aarch64-832.tar.xz