From ca5c064cd185f1ff1c171074d89a981d62661801 Mon Sep 17 00:00:00 2001 From: Mattias Ellert Date: Wed, 15 Jul 2020 06:49:47 +0200 Subject: [PATCH] Fedora 33 builds javadoc the same way EPEL 8 does --- voms-api-java.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/voms-api-java.spec b/voms-api-java.spec index 55b2016..54b21e9 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -1,6 +1,6 @@ Name: voms-api-java Version: 3.3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Virtual Organization Membership Service Java API License: ASL 2.0 @@ -48,8 +48,8 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %pom_xpath_remove "//pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:outputDirectory" %pom_xpath_remove "//pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:reportOutputDirectory" -%if %{?rhel}%{!?rhel:0} == 8 -# EPEL 8 doesn't use the maven-javadoc-plugin to generate javadoc +%if %{?fedora}%{!?fedora:0} >= 33 || %{?rhel}%{!?rhel:0} >= 8 +# F33+ and EPEL8+ doesn't use the maven-javadoc-plugin to generate javadoc # Remove maven-javadoc-plugin configuration to avoid build failure %pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin %endif @@ -78,6 +78,9 @@ Virtual Organization Membership Service (VOMS) Java API Documentation. %license LICENSE %changelog +* Wed Jul 15 2020 Mattias Ellert - 3.3.0-10 +- Fedora 33 builds javadoc the same way EPEL 8 does + * Sat Jul 11 2020 Jiri Vanek - 3.3.0-9 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11