Move to javapackages-filesystem for directory ownership.
Resolves RHBZ#1500288.
This commit is contained in:
parent
44b0152bc4
commit
ad1d27e927
@ -799,8 +799,8 @@ Obsoletes: sinjdoc
|
|||||||
%define java_headless_rpo() %{expand:
|
%define java_headless_rpo() %{expand:
|
||||||
# Require /etc/pki/java/cacerts.
|
# Require /etc/pki/java/cacerts.
|
||||||
Requires: ca-certificates
|
Requires: ca-certificates
|
||||||
# Require javapackages-tools for ownership of /usr/lib/jvm/
|
# Require javapackages-filesystem for ownership of /usr/lib/jvm/
|
||||||
Requires: javapackages-tools
|
Requires: javapackages-filesystem
|
||||||
# Require zoneinfo data provided by tzdata-java subpackage.
|
# Require zoneinfo data provided by tzdata-java subpackage.
|
||||||
Requires: tzdata-java >= 2015d
|
Requires: tzdata-java >= 2015d
|
||||||
# libsctp.so.1 is being `dlopen`ed on demand
|
# libsctp.so.1 is being `dlopen`ed on demand
|
||||||
@ -927,7 +927,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
|
||||||
@ -1271,7 +1271,7 @@ The OpenJDK source bundle %{for_debug}.
|
|||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: OpenJDK API Documentation
|
Summary: OpenJDK API Documentation
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Requires: javapackages-tools
|
Requires: javapackages-filesystem
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%{java_javadoc_rpo %{nil}}
|
%{java_javadoc_rpo %{nil}}
|
||||||
@ -1284,7 +1284,7 @@ The OpenJDK API documentation.
|
|||||||
%package javadoc-zip
|
%package javadoc-zip
|
||||||
Summary: OpenJDK API Documentation compressed in single archive
|
Summary: OpenJDK API Documentation compressed in single archive
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Requires: javapackages-tools
|
Requires: javapackages-filesystem
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%{java_javadoc_rpo %{nil}}
|
%{java_javadoc_rpo %{nil}}
|
||||||
@ -1297,7 +1297,7 @@ The OpenJDK API documentation compressed in single archive.
|
|||||||
%package javadoc-debug
|
%package javadoc-debug
|
||||||
Summary: OpenJDK API Documentation %{for_debug}
|
Summary: OpenJDK API Documentation %{for_debug}
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Requires: javapackages-tools
|
Requires: javapackages-filesystem
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
|
%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
|
||||||
@ -1310,7 +1310,7 @@ The OpenJDK API documentation %{for_debug}.
|
|||||||
%package javadoc-zip-debug
|
%package javadoc-zip-debug
|
||||||
Summary: OpenJDK API Documentation compressed in single archive %{for_debug}
|
Summary: OpenJDK API Documentation compressed in single archive %{for_debug}
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Requires: javapackages-tools
|
Requires: javapackages-filesystem
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
|
%{java_javadoc_rpo -- %{debug_suffix_unquoted}}
|
||||||
@ -2134,6 +2134,10 @@ require "copy_jdk_configs.lua"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 17 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.171-6.b10
|
||||||
|
- Move to javapackages-filesystem over javapackages-tools
|
||||||
|
for directory ownership. Resolves RHBZ#1500288.
|
||||||
|
|
||||||
* Fri May 04 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.171-5.b10
|
* Fri May 04 2018 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.171-5.b10
|
||||||
- Remove duplicate patch rhbz_1538767_fix_linking2.patch. Just use
|
- Remove duplicate patch rhbz_1538767_fix_linking2.patch. Just use
|
||||||
rhbz_1538767_fix_linking.patch.
|
rhbz_1538767_fix_linking.patch.
|
||||||
|
Loading…
Reference in New Issue
Block a user