From f87b4c425c5d3dc48aacf003c07337bc2cb3f0d5 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Mon, 2 Aug 2021 17:44:08 -0500 Subject: [PATCH] Drop javadoc package Resolves: #1952530 --- jss.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/jss.spec b/jss.spec index 6b11cc2..09c5680 100644 --- a/jss.spec +++ b/jss.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 5.0.0 -Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist} %global _phase -alpha1 # To generate the source tarball: @@ -40,8 +40,11 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas # Build Options ################################################################################ -# By default the build will not execute unit tests unless --with test -# option is specified. +# Do not build javadoc package unless --with javadoc option is specified. + +%bcond_with javadoc + +# Do not run unit tests unless --with test option is specified. %bcond_with test @@ -85,6 +88,7 @@ Java Security Services (JSS) is a java native interface which provides a bridge for java-based applications to use native Network Security Services (NSS). This only works with gcj. Other JREs require that JCE providers be signed. +%if %{with javadoc} ################################################################################ %package javadoc ################################################################################ @@ -94,6 +98,7 @@ Requires: jss = %{version}-%{release} %description javadoc This package contains the API documentation for JSS. +%endif ################################################################################ %prep @@ -135,6 +140,10 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA --install-dir=%{buildroot} \ install +%if !%{with javadoc} +rm -rf %{buildroot}/usr/share/javadoc/jss-%{version} +%endif + ################################################################################ %files @@ -144,13 +153,18 @@ modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENA %{_libdir}/* %{_jnidir}/* +%if %{with javadoc} ################################################################################ %files javadoc %defattr(-,root,root,-) %{_javadocdir}/%{name}-%{version}/ +%endif ################################################################################ %changelog +* Mon Aug 2 2021 Red Hat PKI Team - 5.0.0-0.2 +- Drop javadoc package + * Fri Jun 25 2021 Red Hat PKI Team - 5.0.0-0.1 - Rebase to JSS 5.0.0-alpha1