[java-1.7.0-openjdk/f20] - updated to icedtea 2.4.5 - removed buildRequires: pulseaudio >= 0.9.11, as not neccessary - but
jiri vanek
jvanek at fedoraproject.org
Thu Jan 30 17:39:34 UTC 2014
commit 33e7138788ec09c86e4db4d6363e40e023552e75
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Thu Jan 30 18:39:36 2014 +0100
- updated to icedtea 2.4.5
- removed buildRequires: pulseaudio >= 0.9.11, as not neccessary
- but kept libs-devel
- http://blog.fuseyism.com/index.php/2014/01/29/icedtea-2-4-5-released/
- removed upstreamed or unwonted patches (thanx to gnu_andrew to pointing them out)
- patch410 1015432.patch (upstreamed)
- patch411 1029588.patch
- patch412 zero-x32.diff
- patch104 java-1.7.0-ppc-zero-jdk.patch
- patch105 java-1.7.0-ppc-zero-hotspot.patch
- patch402 gstackbounds.patch and patch403 PStack-808293.patch applied always
(again thanx to gnu_andrew)
- merged other gnu_andrew's changes
- FT2_CFLAGS and FT2_LIBS hardoced values replaced by correct pkg-config calls
- buildver bumbed to 31
- added build requires nss-devel
- removed build requires mercurial
- added JRE_RELEASE_VERSION and ALT_PARALLEL_COMPILE_JOBS into make call
.gitignore | 1 +
1015432.patch | 23 ------------
1029588.patch | 20 -----------
java-1.7.0-openjdk-ppc-zero-hotspot.patch | 14 -------
java-1.7.0-openjdk-ppc-zero-jdk.patch | 23 ------------
java-1.7.0-openjdk.spec | 54 +++++++++++++++-------------
sources | 2 +-
zero-x32.diff | 10 -----
8 files changed, 31 insertions(+), 116 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e55e6d3..ae4302c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
/openjdk-icedtea-2.4.3.tar.xz
/openjdk-icedtea-2.3.13.tar.xz
/openjdk-icedtea-2.4.4.tar.xz
+/openjdk-icedtea-2.4.5.tar.xz
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index 082b19f..275799e 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -1,7 +1,7 @@
# If debug is 1, OpenJDK is built with all debug info present.
%global debug 0
-%global icedtea_version 2.4.4
+%global icedtea_version 2.4.5
%global hg_tag icedtea-{icedtea_version}
%global aarch64 aarch64 arm64 armv8
@@ -105,7 +105,7 @@
%global origin openjdk
%global updatever 51
#Fedora have an bogus 60 instead of updatever. Fix when updatever>=60 in version:
-%global buildver 02
+%global buildver 31
# Keep priority on 6digits in case updatever>9
%global priority 1700%{updatever}
%global javaver 1.7.0
@@ -149,7 +149,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.60
-Release: %{icedtea_version}.1%{?dist}
+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
@@ -243,10 +243,6 @@ Patch6: %{name}-debuginfo.patch
# Add rhino support
Patch100: rhino.patch
-# Patch for PPC/PPC64
-Patch104: %{name}-ppc-zero-jdk.patch
-Patch105: %{name}-ppc-zero-hotspot.patch
-
Patch106: %{name}-freetype-check-fix.patch
# allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable
@@ -263,9 +259,6 @@ Patch300: pulse-soundproperties.patch
#Workaround RH902004
Patch402: gstackbounds.patch
Patch403: PStack-808293.patch
-Patch410: 1015432.patch
-Patch411: 1029588.patch
-Patch412: zero-x32.diff
# End of tmp patches
BuildRequires: autoconf
@@ -286,7 +279,6 @@ BuildRequires: libpng-devel
BuildRequires: wget
BuildRequires: libxslt
BuildRequires: xorg-x11-proto-devel
-BuildRequires: mercurial
BuildRequires: ant
BuildRequires: libXinerama-devel
BuildRequires: rhino
@@ -301,10 +293,10 @@ BuildRequires: at-spi-devel
BuildRequires: gawk
BuildRequires: pkgconfig >= 0.9.0
BuildRequires: xorg-x11-utils
+BuildRequires: nss-devel
# PulseAudio build requirements.
%if %{with_pulseaudio}
BuildRequires: pulseaudio-libs-devel >= 0.9.11
-BuildRequires: pulseaudio >= 0.9.11
%endif
# Zero-assembler build requirement.
%ifnarch %{jit_arches}
@@ -524,20 +516,10 @@ tar xzf %{SOURCE9}
%patch106
%patch200
-%ifarch ppc ppc64
-# PPC fixes
-%patch104
-%patch105
-%endif
-
-%ifarch %{jit_arches}
%patch402
%patch403
-%endif
-%patch410
-%patch411
-%patch412
+
%build
# How many cpu's do we have?
@@ -618,13 +600,15 @@ make \
DISTRO_PACKAGE_VERSION="fedora-%{release}-%{_arch} u%{updatever}-b%{buildver}" \
JDK_UPDATE_VERSION=`printf "%02d" %{updatever}` \
JDK_BUILD_NUMBER=b`printf "%02d" %{buildver}` \
+ JRE_RELEASE_VERSION=%{javaver}_`printf "%02d" %{updatever}`-b`printf "%02d" %{buildver}` \
MILESTONE="fcs" \
+ ALT_PARALLEL_COMPILE_JOBS="$NUM_PROC" \
HOTSPOT_BUILD_JOBS="$NUM_PROC" \
STATIC_CXX="false" \
RHINO_JAR="$PWD/../rhino/rhino.jar" \
GENSRCDIR="$PWD/generated.build" \
- FT2_CFLAGS="-I/usr/include/freetype2 " \
- FT2_LIBS="-lfreetype " \
+ FT2_CFLAGS="`pkg-config --cflags freetype2` " \
+ FT2_LIBS="`pkg-config --libs freetype2` " \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
STRIP_POLICY="no_strip" \
@@ -1394,6 +1378,26 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog
+* Thu Jan 30 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.51-2.4.5.0.f20
+- removed buildRequires: pulseaudio >= 0.9.11, as not neccessary
+ - but kept libs-devel
+- updated to icedtea 2.4.5
+ - http://blog.fuseyism.com/index.php/2014/01/29/icedtea-2-4-5-released/
+- removed upstreamed or unwonted patches (thanx to gnu_andrew to pointing them out)
+ - patch410 1015432.patch (upstreamed)
+ - patch411 1029588.patch
+ - patch412 zero-x32.diff
+ - patch104 java-1.7.0-ppc-zero-jdk.patch
+ - patch105 java-1.7.0-ppc-zero-hotspot.patch
+- patch402 gstackbounds.patch and patch403 PStack-808293.patch applied always
+ (again thanx to gnu_andrew)
+- merged other gnu_andrew's changes
+ - FT2_CFLAGS and FT2_LIBS hardoced values replaced by correct pkg-config calls
+ - buildver bumbed to 31
+- added build requires nss-devel
+- removed build requires mercurial
+- added JRE_RELEASE_VERSION and ALT_PARALLEL_COMPILE_JOBS into make call
+
* Fri Jan 17 2014 Jiri Vanek <jvanek at redhat.com> - 1.7.0.51-2.4.4.1.f20
- removed 2.3 tarball due to security issues
- this causes zero arm32 jit to not exists eny more (aprox 30% slowdown)
diff --git a/sources b/sources
index aa7eb60..f4a65db 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
ea344cc5b53b73f375558ba41760ff64 class-rewriter.tar.gz
1cb61996cf5dbe80827abbe7d009bf28 pulseaudio.tar.gz
785b5ff80beef8cc095e25345c6c8242 systemtap-tapset-2013-10-02.tar.gz
-d82a5b549b0050d0e3071189df822164 openjdk-icedtea-2.4.4.tar.xz
\ No newline at end of file
+ee3e2afb9714191159b2041365fb1a4c openjdk-icedtea-2.4.5.tar.xz
More information about the scm-commits
mailing list