This commit is contained in:
parent
5958bb69de
commit
4e307b9266
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 16 20:07:56 UTC 2014 - fstrba@suse.com
|
||||
|
||||
- Allow building for SLE11
|
||||
* Conditionalize BuildRequires
|
||||
* Conditionalize cxxflags not understood by gcc 4.3
|
||||
* Conditionalize javadoc noarch build for distributions that
|
||||
understand the per-package BuildArch
|
||||
- Try to make the jre-32 and jre-64 provides more automatic
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 7 06:25:32 UTC 2014 - fstrba@suse.com
|
||||
|
||||
|
@ -64,6 +64,15 @@
|
||||
%global cacerts %{_jvmdir}/%{jredir}/lib/security/cacerts
|
||||
# real file made by update-ca-certificates
|
||||
%global javacacerts %{_var}/lib/ca-certificates/java-cacerts
|
||||
# turn zero on non jit arches by default
|
||||
%ifnarch %{jit_arches}
|
||||
%global _with_zero 1
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1140
|
||||
%global with_pulseaudio 1
|
||||
%else
|
||||
%global with_pulseaudio 0
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
%global archinstall amd64
|
||||
%endif
|
||||
@ -117,10 +126,13 @@
|
||||
%ifnarch %{jit_arches}
|
||||
%global _with_zero 1
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1140
|
||||
%global with_pulseaudio 1
|
||||
%else
|
||||
%global with_pulseaudio 0
|
||||
# bnc#542545
|
||||
# 32-bit versus 64-bit specific provides:
|
||||
%ifarch %ix86 ppc s390
|
||||
%global bits 32
|
||||
%endif
|
||||
%ifarch x86_64 ia64 s390x
|
||||
%global bits 64
|
||||
%endif
|
||||
%bcond_with zero
|
||||
# Turn on/off some features depending on openSUSE version
|
||||
@ -276,12 +288,6 @@ BuildRequires: libXinerama-devel
|
||||
BuildRequires: libXt-devel
|
||||
BuildRequires: libXtst-devel
|
||||
%endif
|
||||
%ifarch %ix86 ppc
|
||||
Provides: jre-32 = %{javaver}
|
||||
%endif
|
||||
%ifarch x86_64
|
||||
Provides: jre-64 = %{javaver}
|
||||
%endif
|
||||
%if %{bootcycle}
|
||||
BuildRequires: java-bootstrap-devel >= 1.6.0
|
||||
%else
|
||||
@ -340,6 +346,20 @@ Provides: jndi-dns = %{version}
|
||||
Provides: jndi-ldap = %{version}
|
||||
Provides: jndi-rmi = %{version}
|
||||
Provides: jsse = %{version}
|
||||
# Required at least by fop
|
||||
Provides: java-%{bits} = %{javaver}
|
||||
Provides: java-%{javaver}-%{bits}
|
||||
Provides: java-openjdk-%{bits} = %{version}-%{release}
|
||||
Provides: jre-%{bits} = %{javaver}
|
||||
Provides: jre-%{javaver}-%{bits}
|
||||
Provides: jre-%{javaver}-openjdk-%{bits} = %{version}-%{release}
|
||||
Provides: jre-openjdk-%{bits} = %{version}-%{release}
|
||||
Provides: jre1.3.x
|
||||
Provides: jre1.4.x
|
||||
Provides: jre1.5.x
|
||||
Provides: jre1.6.x
|
||||
Provides: jre1.7.x
|
||||
Provides: jre1.8.x
|
||||
|
||||
%description headless
|
||||
The OpenJDK runtime environment without audio and video support.
|
||||
@ -392,7 +412,9 @@ Requires(postun): update-alternatives
|
||||
# Standard JPackage javadoc provides.
|
||||
Provides: java-%{javaver}-javadoc = %{version}-%{release}
|
||||
Provides: java-javadoc = %{version}-%{release}
|
||||
%if 0%{?suse_version} >= 1120
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
%description javadoc
|
||||
The OpenJDK API documentation.
|
||||
@ -577,8 +599,10 @@ bash ../configure \
|
||||
%ifnarch %{arm}
|
||||
--with-num-cores="$NUM_PROC" \
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1120
|
||||
--with-extra-cflags="-fno-devirtualize" \
|
||||
--with-extra-cxxflags="-fno-devirtualize"
|
||||
%endif
|
||||
|
||||
# The combination of FULL_DEBUG_SYMBOLS=0 and ALT_OBJCOPY=/does_not_exist
|
||||
# disables FDS for all build configs and reverts to pre-FDS make logic.
|
||||
|
Loading…
x
Reference in New Issue
Block a user