| |
@@ -394,8 +394,8 @@
|
| |
%global jdkimage jdk
|
| |
%global static_libs_image static-libs
|
| |
# output dir stub
|
| |
- %define buildoutputdir() %{expand:build/jdk11.build%{?1}}
|
| |
- %define installoutputdir() %{expand:install/jdk11.install%{?1}}
|
| |
+ %define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
|
| |
+ %define installoutputdir() %{expand:install/jdk%{featurever}.install%{?1}}
|
| |
# we can copy the javadoc to not arched dir, or make it not noarch
|
| |
%define uniquejavadocdir() %{expand:%{fullversion}.%{_arch}%{?1}}
|
| |
# main id and dir of this jdk
|
| |
@@ -410,7 +410,7 @@
|
| |
%if %is_system_jdk
|
| |
%global __provides_exclude ^(%{_privatelibs})$
|
| |
%global __requires_exclude ^(%{_privatelibs})$
|
| |
- # Never generate lib-style provides/requires for slowdebug packages
|
| |
+ # Never generate lib-style provides/requires for any debug packages
|
| |
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
|
| |
%global __requires_exclude_from ^.*/%{uniquesuffix -- %{debug_suffix_unquoted}}/.*$
|
| |
%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_suffix_unquoted}}/.*$
|
| |
@@ -1598,7 +1598,9 @@
|
| |
|
| |
%description javadoc
|
| |
The %{origin_nice} %{featurever} API documentation.
|
| |
+ %endif
|
| |
|
| |
+ %if %{include_normal_build}
|
| |
%package javadoc-zip
|
| |
Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive
|
| |
%if 0%{?rhel} <= 8
|
| |
