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

Merge remote-tracking branch 'origin/f21'

Browse Source
This commit is contained in:
Jiri Vanek 2014-08-14 19:00:42 +02:00
commit 587d58b9f7
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
java-1.8.0-openjdk.spec
View File

@ -137,7 +137,7 @@
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever} Version: %{javaver}.%{updatever}
Release: 14.%{buildver}%{?dist} Release: 15.%{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
@ -296,8 +296,8 @@ Provides: java = %{epoch}:%{javaver}
# Standard JPackage extensions provides. # Standard JPackage extensions provides.
Provides: java-fonts = %{epoch}:%{version} Provides: java-fonts = %{epoch}:%{version}
Obsoletes: java-1.7.0-openjdk <= 1:1.7.0.60-2.5.0.2 Obsoletes: java-1.7.0-openjdk
Provides: java-1.7.0-openjdk = %{epoch}:%{version}-%{release} Provides: java-1.8.0-openjdk = %{epoch}:%{version}-%{release}
%description %description
The OpenJDK runtime environment. The OpenJDK runtime environment.
@ -337,8 +337,8 @@ Provides: jce = %{epoch}:%{version}
Provides: jdbc-stdext = 4.1 Provides: jdbc-stdext = 4.1
Provides: java-sasl = %{epoch}:%{version} Provides: java-sasl = %{epoch}:%{version}
Obsoletes: java-1.7.0-openjdk-headless <= 1:1.7.0.60-2.5.0.2 Obsoletes: java-1.7.0-openjdk-headless
Provides: java-1.7.0-openjdk-headless = %{epoch}:%{version}-%{release} Provides: java-1.8.0-openjdk-headless = %{epoch}:%{version}-%{release}
%description headless %description headless
The OpenJDK runtime environment without audio and video support. The OpenJDK runtime environment without audio and video support.
@ -364,8 +364,8 @@ Provides: java-%{javaver}-devel = %{epoch}:%{version}
Provides: java-devel-%{origin} = %{epoch}:%{version} Provides: java-devel-%{origin} = %{epoch}:%{version}
Provides: java-devel = %{epoch}:%{javaver} Provides: java-devel = %{epoch}:%{javaver}
Obsoletes: java-1.7.0-openjdk-devel <= 1:1.7.0.60-2.5.0.2 Obsoletes: java-1.7.0-openjdk-devel
Provides: java-1.7.0-openjdk-devel = %{epoch}:%{version}-%{release} Provides: java-1.8.0-openjdk-devel = %{epoch}:%{version}-%{release}
%description devel %description devel
The OpenJDK development tools. The OpenJDK development tools.
@ -377,8 +377,8 @@ Group: Development/Languages
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release}
Obsoletes: java-1.7.0-openjdk-demo <= 1:1.7.0.60-2.5.0.2 Obsoletes: java-1.7.0-openjdk-demo
Provides: java-1.7.0-openjdk-demo = %{epoch}:%{version}-%{release} Provides: java-1.8.0-openjdk-demo = %{epoch}:%{version}-%{release}
%description demo %description demo
The OpenJDK demos. The OpenJDK demos.
@ -389,8 +389,8 @@ Group: Development/Languages
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Obsoletes: java-1.7.0-openjdk-src <= 1:1.7.0.60-2.5.0.2 Obsoletes: java-1.7.0-openjdk-src
Provides: java-1.7.0-openjdk-src = %{epoch}:%{version}-%{release} Provides: java-1.8.0-openjdk-src = %{epoch}:%{version}-%{release}
%description src %description src
The OpenJDK source bundle. The OpenJDK source bundle.
@ -411,8 +411,8 @@ Requires(postun): %{_sbindir}/alternatives
Provides: java-javadoc = %{epoch}:%{version}-%{release} Provides: java-javadoc = %{epoch}:%{version}-%{release}
Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release}
Obsoletes: java-1.7.0-openjdk-javadoc <= 1:1.7.0.60-2.5.0.2 Obsoletes: java-1.7.0-openjdk-javadoc
Provides: java-1.7.0-openjdk-javadoc = %{epoch}:%{version}-%{release} Provides: java-1.8.0-openjdk-javadoc = %{epoch}:%{version}-%{release}
%description javadoc %description javadoc
The OpenJDK API documentation. The OpenJDK API documentation.
@ -423,8 +423,8 @@ Requires: java-atk-wrapper
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless = %{epoch}:%{version}-%{release}
Obsoletes: java-1.7.0-openjdk-accessibility <= 1:1.7.0.60-2.5.0.2 Obsoletes: java-1.7.0-openjdk-accessibility
Provides: java-1.7.0-openjdk-accessibility = %{epoch}:%{version}-%{release} Provides: java-1.8.0-openjdk-accessibility = %{epoch}:%{version}-%{release}
%description accessibility %description accessibility
Enables accessibility support in OpenJDK by using java-atk-wrapper. This allows Enables accessibility support in OpenJDK by using java-atk-wrapper. This allows
@ -1344,6 +1344,9 @@ exit 0
%{_jvmdir}/%{jredir}/lib/accessibility.properties %{_jvmdir}/%{jredir}/lib/accessibility.properties
%changelog %changelog
* Thu Aug 14 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.11-15.b12
- fixed provides/obsolates
* Tue Aug 12 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.11-14.b12 * Tue Aug 12 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.11-14.b12
- forced to build in fully versioned dir - forced to build in fully versioned dir