rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleanup spec file conditionals

Browse Source
This commit is contained in:
Jiri Vanek 2017-09-11 17:11:17 +02:00
parent 88af82c22d
commit fdb8682048
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java-1.8.0-openjdk.spec
View File

@ -933,7 +933,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%{?1}
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever} Version: %{javaver}.%{updatever}
Release: 5.%{buildver}%{?dist} Release: 6.%{buildver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # 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 # 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 # also included the epoch in their virtual provides. This created a
@ -1138,7 +1138,7 @@ BuildRequires: xorg-x11-proto-devel
BuildRequires: zip BuildRequires: zip
# Use OpenJDK 7 where available (on RHEL) to avoid # Use OpenJDK 7 where available (on RHEL) to avoid
# having to use the rhel-7.x-java-unsafe-candidate hack # having to use the rhel-7.x-java-unsafe-candidate hack
%if 0%{?rhel} %if 0%{?rhel} <= 7
BuildRequires: java-1.7.0-openjdk-devel BuildRequires: java-1.7.0-openjdk-devel
%else %else
BuildRequires: java-1.8.0-openjdk-devel BuildRequires: java-1.8.0-openjdk-devel
@ -1499,7 +1499,7 @@ sh %{SOURCE12}
%patch539 %patch539
# RHEL-only patches # RHEL-only patches
%if 0%{?rhel} %if 0%{?rhel} <= 7
%patch534 %patch534
%endif %endif
@ -2126,6 +2126,9 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Fri Sep 08 2017 Troy Dawson <tdawson@redhat.com> - 1:1.8.0.144-6.b01
- Cleanup spec file conditionals
* Fri Aug 25 2017 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.144-4.b01 * Fri Aug 25 2017 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.144-4.b01
- added ownership of diretories which were oonly listing files - added ownership of diretories which were oonly listing files