Obsolete javadoc-slowdebug and javadoc-slowdebug-zip packages via javadoc and javadoc-zip respectively.

This commit is contained in:
Andrew Hughes 2019-07-24 04:53:45 +01:00 committed by Petra Mikova
parent 9e4956444e
commit d38ad1131f

View File

@ -227,7 +227,7 @@
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 33 %global buildver 33
%global rpmrelease 2 %global rpmrelease 3
# priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
%if %is_system_jdk %if %is_system_jdk
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@ -1225,6 +1225,7 @@ The java-%{origin}-src-slowdebug sub-package contains the complete %{origin_nice
%package javadoc %package javadoc
Summary: %{origin_nice} %{majorver} API documentation Summary: %{origin_nice} %{majorver} API documentation
Requires: javapackages-filesystem Requires: javapackages-filesystem
Obsoletes: javadoc-slowdebug < 1:13.0.0.33-1.rolling
%{java_javadoc_rpo %{nil}} %{java_javadoc_rpo %{nil}}
@ -1234,13 +1235,14 @@ The %{origin_nice} %{majorver} API documentation.
%if %{include_normal_build} %if %{include_normal_build}
%package javadoc-zip %package javadoc-zip
Summary: %{origin_nice} %{majorver} API documentation compressed in single archive Summary: %{origin_nice} %{majorver} API documentation compressed in a single archive
Requires: javapackages-filesystem Requires: javapackages-filesystem
Obsoletes: javadoc-zip-slowdebug < 1:13.0.0.33-1.rolling
%{java_javadoc_rpo %{nil}} %{java_javadoc_rpo %{nil}}
%description javadoc-zip %description javadoc-zip
The %{origin_nice} %{majorver} API documentation compressed in single archive. The %{origin_nice} %{majorver} API documentation compressed in a single archive.
%endif %endif
%prep %prep
@ -1816,6 +1818,9 @@ require "copy_jdk_configs.lua"
%changelog %changelog
* Wed Oct 02 2019 Andrew Hughes <gnu.andrew@redhat.com> - 1:13.0.0.33-3.rolling
- Obsolete javadoc-slowdebug and javadoc-slowdebug-zip packages via javadoc and javadoc-zip respectively.
* Tue Oct 01 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:13.0.0.33-2.rolling * Tue Oct 01 2019 Severin Gehwolf <sgehwolf@redhat.com> - 1:13.0.0.33-2.rolling
- Don't produce javadoc/javadoc-zip sub packages for the - Don't produce javadoc/javadoc-zip sub packages for the
debug variant build. debug variant build.