From bb2f20ddb4ae17091828ef220ffd64ce5eccbb3a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 28 Nov 2023 23:16:51 -0500 Subject: [PATCH] Disable unwanted components in RHEL builds --- dogtag-pki.spec | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/dogtag-pki.spec b/dogtag-pki.spec index 0bf9d8c..640653d 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -30,7 +30,7 @@ URL: https://www.dogtagpki.org # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPL-2.0-only and LGPL-2.0-only Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.2 # To create a tarball from a version tag: # $ git archive \ @@ -98,6 +98,16 @@ ExcludeArch: i686 %bcond_without ca %bcond_without est %bcond_without kra +%if 0%{?rhel} +%bcond_with ocsp +%bcond_with tks +%bcond_with tps +%bcond_with javadoc +%bcond_with theme +%bcond_with meta +%bcond_with tests +%bcond_with debug +%else %bcond_without ocsp %bcond_without tks %bcond_without tps @@ -106,6 +116,7 @@ ExcludeArch: i686 %bcond_without meta %bcond_without tests %bcond_without debug +%endif # Don't build console unless --with console is specified. %bcond_with console @@ -224,8 +235,8 @@ BuildRequires: freeipa-healthcheck-core BuildRequires: nss-tools BuildRequires: openssl -# description for top-level package (if there is a separate meta package) -%if "%{name}" != "%{product_id}" +# description for top-level package (if there is no separate meta package) +%if %{without meta} %description %{product_name} is an enterprise software system designed @@ -241,9 +252,8 @@ to manage enterprise Public Key Infrastructure deployments. * Automatic Certificate Management Environment (ACME) Responder * Enrollment over Secure Transport (EST) Responder -%endif +%else -%if %{with meta} %if "%{name}" != "%{product_id}" ################################################################################ %package -n %{product_id} @@ -1132,6 +1142,10 @@ fi %{_mandir}/man8/pki-healthcheck.8.gz %{_datadir}/pki/setup/ %{_datadir}/pki/server/ +%if %{without theme} +%exclude %{_datadir}/pki/CS_SERVER_VERSION +%exclude %{_datadir}/pki/common-ui/ +%endif # with server %endif @@ -1287,6 +1301,10 @@ fi ################################################################################ %changelog +* Wed Nov 29 2023 Yaakov Selkowitz - 11.4.3-2.2 +- Disable unwanted components in RHEL builds +- Update conditionals for RHEL 10 + * Wed Jul 19 2023 Fedora Release Engineering - 11.4.3-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild