From 7c60a2b3370b3b7448312a39615917b00e9dd9ab Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Wed, 24 Jul 2019 04:53:45 +0100 Subject: [PATCH] Obsolete javadoc-slowdebug and javadoc-slowdebug-zip packages via javadoc and javadoc-zip respectively. --- java-latest-openjdk.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index fc7c0c8..e416241 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -227,7 +227,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %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 %if %is_system_jdk %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 Summary: %{origin_nice} %{majorver} API documentation Requires: javapackages-filesystem +Obsoletes: javadoc-slowdebug < 1:13.0.0.33-1.rolling %{java_javadoc_rpo %{nil}} @@ -1234,13 +1235,14 @@ The %{origin_nice} %{majorver} API documentation. %if %{include_normal_build} %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 +Obsoletes: javadoc-zip-slowdebug < 1:13.0.0.33-1.rolling %{java_javadoc_rpo %{nil}} %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 %prep @@ -1816,6 +1818,9 @@ require "copy_jdk_configs.lua" %changelog +* Wed Oct 02 2019 Andrew Hughes - 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 - 1:13.0.0.33-2.rolling - Don't produce javadoc/javadoc-zip sub packages for the debug variant build.