From 79de1c70fc96069aa21f79a73a376d466f61025f Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 12 Aug 2021 13:07:35 -0500 Subject: [PATCH] Rebase to PKI 11.0.0-alpha2 --- .gitignore | 1 + dogtag-pki.spec | 425 ++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 218 insertions(+), 210 deletions(-) diff --git a/.gitignore b/.gitignore index f061852..df9ca1a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /pki-10.11.0-alpha1.tar.gz /pki-10.11.0-alpha2.tar.gz /pki-11.0.0-alpha1.tar.gz +/pki-11.0.0-alpha2.tar.gz diff --git a/dogtag-pki.spec b/dogtag-pki.spec index fc248fd..ab412e1 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -2,10 +2,11 @@ Name: dogtag-pki ################################################################################ -%global vendor_id dogtag -%global brand Dogtag +%global product_name Dogtag PKI +%global product_id dogtag-pki +%global theme dogtag -Summary: %{brand} PKI Package +Summary: %{product_name} Package URL: https://www.dogtagpki.org # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2 License: GPLv2 and LGPLv2 @@ -13,8 +14,8 @@ License: GPLv2 and 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: 11.0.0 -Release: 0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha1 +Release: 0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist} +%global _phase -alpha2 # To create a tarball from a version tag: # $ git archive \ @@ -86,8 +87,7 @@ ExcludeArch: i686 # If --with pkgs option is specified, only packages specified with # --with will be built (inclusion method). -# bcond_with pkgs -%global with_pkgs 1 +%bcond_with pkgs # Define package_option macro to wrap bcond_with or bcond_without macro # depending on package selection method. @@ -101,25 +101,19 @@ ExcludeArch: i686 # Define --with or --without options depending on # package selection method. -# package_option base -# package_option server -# package_option acme -# package_option ca -# package_option kra -# package_option ocsp -%global with_ocsp 1 -# package_option tks -%global with_tks 1 -# package_option tps -%global with_tps 1 -# package_option javadoc -%global with_javadoc 1 -# package_option theme -%global with_theme 1 -# package_option meta -%global with_meta 1 -# package_option tests -# package_option debug +%package_option base +%package_option server +%package_option acme +%package_option ca +%package_option kra +%package_option ocsp +%package_option tks +%package_option tps +%package_option javadoc +%package_option theme +%package_option meta +%package_option tests +%package_option debug %if ! %{with debug} %define debug_package %{nil} @@ -247,13 +241,13 @@ BuildRequires: nss-tools BuildRequires: openssl # description for top-level package (if there is a separate meta package) -%if "%{name}" != "%{vendor_id}-pki" +%if "%{name}" != "%{product_id}" %description -%{brand} PKI is an enterprise software system designed +%{product_name} is an enterprise software system designed to manage enterprise Public Key Infrastructure deployments. -PKI consists of the following components: +%{product_name} consists of the following components: * Automatic Certificate Management Environment (ACME) Responder * Certificate Authority (CA) @@ -265,36 +259,32 @@ PKI consists of the following components: %endif %if %{with meta} -%if "%{name}" != "%{vendor_id}-pki" +%if "%{name}" != "%{product_id}" ################################################################################ -%package -n %{vendor_id}-pki +%package -n %{product_id} ################################################################################ -Summary: %{brand} PKI Package +Summary: %{product_name} Package %endif +Obsoletes: pki-console < %{version} +Obsoletes: pki-console-theme < %{version} +Obsoletes: idm-console-framework < 2.0 + # Make certain that this 'meta' package requires the latest version(s) # of ALL PKI theme packages -Requires: %{vendor_id}-pki-server-theme = %{version} -%if %{with console} -Requires: %{vendor_id}-pki-console-theme = %{version} -%endif +Requires: %{product_id}-server-theme = %{version}-%{release} # Make certain that this 'meta' package requires the latest version(s) # of ALL PKI core packages -Requires: pki-acme = %{version} -Requires: pki-ca = %{version} -Requires: pki-kra = %{version} -Requires: pki-ocsp = %{version} -Requires: pki-tks = %{version} -Requires: pki-tps = %{version} +Requires: %{product_id}-acme = %{version}-%{release} +Requires: %{product_id}-ca = %{version}-%{release} +Requires: %{product_id}-kra = %{version}-%{release} +Requires: %{product_id}-ocsp = %{version}-%{release} +Requires: %{product_id}-tks = %{version}-%{release} +Requires: %{product_id}-tps = %{version}-%{release} -# Make certain that this 'meta' package requires the latest version(s) -# of PKI console -%if %{with console} -Requires: pki-console = %{version} -%endif -Requires: pki-javadoc = %{version} +Requires: %{product_id}-javadoc = %{version}-%{release} # Make certain that this 'meta' package requires the latest version(s) # of ALL PKI clients -- except for s390/s390x where 'esc' is not built @@ -303,16 +293,16 @@ Requires: esc >= 1.1.1 %endif # description for top-level package (unless there is a separate meta package) -%if "%{name}" == "%{vendor_id}-pki" +%if "%{name}" == "%{product_id}" %description %else -%description -n %{vendor_id}-pki +%description -n %{product_id} %endif -%{brand} PKI is an enterprise software system designed +%{product_name} is an enterprise software system designed to manage enterprise Public Key Infrastructure deployments. -PKI consists of the following components: +%{product_name} consists of the following components: * Automatic Certificate Management Environment (ACME) Responder * Certificate Authority (CA) @@ -326,10 +316,13 @@ PKI consists of the following components: %if %{with base} ################################################################################ -%package -n pki-symkey +%package -n %{product_id}-symkey ################################################################################ -Summary: PKI Symmetric Key Package +Summary: %{product_name} Symmetric Key Package + +Obsoletes: pki-symkey < %{version}-%{release} +Provides: pki-symkey = %{version}-%{release} Requires: %{java_headless} Requires: jpackage-utils >= 0:1.7.5-10 @@ -340,21 +333,20 @@ Requires: nss >= 3.38.0 Conflicts: pki-symkey < %{version} Conflicts: pki-javadoc < %{version} Conflicts: pki-server-theme < %{version} -%if %{with console} -Conflicts: pki-console-theme < %{version} -%endif -%description -n pki-symkey -The PKI Symmetric Key Java Package supplies various native -symmetric key operations to Java programs. +%description -n %{product_id}-symkey +This package provides library for symmetric key operations. ################################################################################ -%package -n pki-base +%package -n %{product_id}-base ################################################################################ -Summary: PKI Base Package +Summary: %{product_name} Base Package BuildArch: noarch +Obsoletes: pki-base < %{version}-%{release} +Provides: pki-base = %{version}-%{release} + Requires: nss >= 3.36.1 Requires: python3-pki = %{version}-%{release} @@ -364,45 +356,51 @@ Requires(post): python3-pki = %{version}-%{release} Conflicts: pki-symkey < %{version} Conflicts: pki-javadoc < %{version} Conflicts: pki-server-theme < %{version} -%if %{with console} -Conflicts: pki-console-theme < %{version} -%endif -%description -n pki-base -The PKI Base Package contains the common and client libraries and utilities -written in Python. +%description -n %{product_id}-base +This package provides default configuration files for %{product_name} client. ################################################################################ -%package -n python3-pki +%package -n python3-%{product_id} ################################################################################ -Summary: PKI Python 3 Package +Summary: %{product_name} Python 3 Package BuildArch: noarch -Obsoletes: pki-base-python3 < %{version} -Provides: pki-base-python3 = %{version} +Obsoletes: python3-pki < %{version}-%{release} +Provides: python3-pki = %{version}-%{release} + +Obsoletes: pki-base-python3 < %{version}-%{release} +Provides: pki-base-python3 = %{version}-%{release} + %if 0%{?fedora} || 0%{?rhel} > 8 %{?python_provide:%python_provide python3-pki} %endif -Requires: pki-base = %{version}-%{release} +Requires: %{product_id}-base = %{version}-%{release} Requires: python3 >= 3.5 Requires: python3-cryptography Requires: python3-ldap Requires: python3-lxml Requires: python3-requests >= 2.6.0 Requires: python3-six +%if 0%{?rhel} < 9 || 0%{?fedora} < 34 +Recommends: python3-nss +%endif -%description -n python3-pki -This package contains PKI client library for Python 3. +%description -n python3-%{product_id} +This package provides common and client library for Python 3. ################################################################################ -%package -n pki-base-java +%package -n %{product_id}-base-java ################################################################################ -Summary: PKI Base Java Package +Summary: %{product_name} Base Java Package BuildArch: noarch +Obsoletes: pki-base-java < %{version}-%{release} +Provides: pki-base-java = %{version}-%{release} + Requires: %{java_headless} Requires: apache-commons-cli Requires: apache-commons-codec @@ -416,7 +414,7 @@ Requires: slf4j-jdk14 Requires: jpackage-utils >= 0:1.7.5-10 Requires: jss >= 5.0.0 Requires: ldapjdk >= 5.0.0 -Requires: pki-base = %{version}-%{release} +Requires: %{product_id}-base = %{version}-%{release} %if 0%{?rhel} && 0%{?rhel} <= 8 Requires: resteasy >= 3.0.26 @@ -435,48 +433,53 @@ Requires: xalan-j2 Requires: xerces-j2 Requires: xml-commons-resolver -%description -n pki-base-java -The PKI Base Java Package contains the common and client libraries and utilities -written in Java. +%description -n %{product_id}-base-java +This package provides common and client libraries for Java. ################################################################################ -%package -n pki-tools +%package -n %{product_id}-tools ################################################################################ -Summary: PKI Tools Package +Summary: %{product_name} Tools Package + +Obsoletes: pki-tools < %{version}-%{release} +Provides: pki-tools = %{version}-%{release} Requires: openldap-clients Requires: nss-tools >= 3.36.1 -Requires: pki-base-java = %{version}-%{release} +Requires: %{product_id}-base-java = %{version}-%{release} Requires: p11-kit-trust # PKICertImport depends on certutil and openssl Requires: nss-tools Requires: openssl -%description -n pki-tools -This package contains PKI executables that can be used to help make -Certificate System into a more complete and robust PKI solution. +%description -n %{product_id}-tools +This package provides tools that can be used to help make +%{product_name} into a more complete and robust PKI solution. # with base %endif %if %{with server} ################################################################################ -%package -n pki-server +%package -n %{product_id}-server ################################################################################ -Summary: PKI Server Package +Summary: %{product_name} Server Package BuildArch: noarch +Obsoletes: pki-server < %{version}-%{release} +Provides: pki-server = %{version}-%{release} + Requires: hostname Requires: policycoreutils Requires: procps-ng Requires: openldap-clients Requires: openssl -Requires: pki-symkey = %{version}-%{release} -Requires: pki-tools = %{version}-%{release} +Requires: %{product_id}-symkey = %{version}-%{release} +Requires: %{product_id}-tools = %{version}-%{release} Requires: keyutils @@ -494,10 +497,8 @@ Requires: pki-servlet-engine Requires: tomcat >= 1:9.0.7 %endif -Requires: sudo Requires: systemd Requires(post): systemd-units -Requires(preun): systemd-units Requires(postun): systemd-units Requires(pre): shadow-utils Requires: tomcatjss >= 8.0.0 @@ -523,25 +524,27 @@ Provides: bundled(js-jquery-i18n-properties) = 1.2.7 Provides: bundled(js-patternfly) = 3.59.2 Provides: bundled(js-underscore) = 1.9.2 -%description -n pki-server -The PKI Server Package contains libraries and utilities needed by other -PKI subsystems. +%description -n %{product_id}-server +This package provides libraries and utilities needed by %{product_name} services. # with server %endif %if %{with acme} ################################################################################ -%package -n pki-acme +%package -n %{product_id}-acme ################################################################################ -Summary: PKI ACME Package +Summary: %{product_name} ACME Package BuildArch: noarch -Requires: pki-server = %{version}-%{release} +Obsoletes: pki-acme < %{version}-%{release} +Provides: pki-acme = %{version}-%{release} -%description -n pki-acme -The PKI ACME responder is a service that provides an automatic certificate +Requires: %{product_id}-server = %{version}-%{release} + +%description -n %{product_id}-acme +%{product_name} ACME responder is a service that provides an automatic certificate management via ACME v2 protocol defined in RFC 8555. # with acme @@ -549,19 +552,21 @@ management via ACME v2 protocol defined in RFC 8555. %if %{with ca} ################################################################################ -%package -n pki-ca +%package -n %{product_id}-ca ################################################################################ -Summary: PKI CA Package +Summary: %{product_name} CA Package BuildArch: noarch -Requires: pki-server = %{version}-%{release} +Obsoletes: pki-ca < %{version}-%{release} +Provides: pki-ca = %{version}-%{release} + +Requires: %{product_id}-server = %{version}-%{release} Requires(post): systemd-units -Requires(preun): systemd-units Requires(postun): systemd-units -%description -n pki-ca -The Certificate Authority (CA) is a required PKI subsystem which issues, +%description -n %{product_id}-ca +%{product_name} Certificate Authority (CA) is a required subsystem which issues, renews, revokes, and publishes certificates as well as compiling and publishing Certificate Revocation Lists (CRLs). @@ -574,19 +579,21 @@ where it obtains its own signing certificate from a public CA. %if %{with kra} ################################################################################ -%package -n pki-kra +%package -n %{product_id}-kra ################################################################################ -Summary: PKI KRA Package +Summary: %{product_name} KRA Package BuildArch: noarch -Requires: pki-server = %{version}-%{release} +Obsoletes: pki-kra < %{version}-%{release} +Provides: pki-kra = %{version}-%{release} + +Requires: %{product_id}-server = %{version}-%{release} Requires(post): systemd-units -Requires(preun): systemd-units Requires(postun): systemd-units -%description -n pki-kra -The Key Recovery Authority (KRA) is an optional PKI subsystem that can act +%description -n %{product_id}-kra +%{product_name} Key Recovery Authority (KRA) is an optional subsystem that can act as a key archival facility. When configured in conjunction with the Certificate Authority (CA), the KRA stores private encryption keys as part of the certificate enrollment process. The key archival mechanism is triggered @@ -605,19 +612,21 @@ since such archival would undermine non-repudiation properties of signing keys. %if %{with ocsp} ################################################################################ -%package -n pki-ocsp +%package -n %{product_id}-ocsp ################################################################################ -Summary: PKI OCSP Package +Summary: %{product_name} OCSP Package BuildArch: noarch -Requires: pki-server = %{version} +Obsoletes: pki-ocsp < %{version}-%{release} +Provides: pki-ocsp = %{version}-%{release} + +Requires: %{product_id}-server = %{version}-%{release} Requires(post): systemd-units -Requires(preun): systemd-units Requires(postun): systemd-units -%description -n pki-ocsp -The Online Certificate Status Protocol (OCSP) Manager is an optional PKI +%description -n %{product_id}-ocsp +%{product_name} Online Certificate Status Protocol (OCSP) Manager is an optional subsystem that can act as a stand-alone OCSP service. The OCSP Manager performs the task of an online certificate validation authority by enabling OCSP-compliant clients to do real-time verification of certificates. Note @@ -643,19 +652,21 @@ whenever they are issued or updated. %if %{with tks} ################################################################################ -%package -n pki-tks +%package -n %{product_id}-tks ################################################################################ -Summary: PKI TKS Package +Summary: %{product_name} TKS Package BuildArch: noarch -Requires: pki-server = %{version} +Obsoletes: pki-tks < %{version}-%{release} +Provides: pki-tks = %{version}-%{release} + +Requires: %{product_id}-server = %{version}-%{release} Requires(post): systemd-units -Requires(preun): systemd-units Requires(postun): systemd-units -%description -n pki-tks -The Token Key Service (TKS) is an optional PKI subsystem that manages the +%description -n %{product_id}-tks +%{product_name} Token Key Service (TKS) is an optional subsystem that manages the master key(s) and the transport key(s) required to generate and distribute keys for hardware tokens. TKS provides the security between tokens and an instance of Token Processing System (TPS), where the security relies upon the @@ -675,14 +686,16 @@ behind the firewall with restricted access. %if %{with tps} ################################################################################ -%package -n pki-tps +%package -n %{product_id}-tps ################################################################################ -Summary: PKI TPS Package +Summary: %{product_name} TPS Package -Requires: pki-server = %{version} +Obsoletes: pki-tps < %{version}-%{release} +Provides: pki-tps = %{version}-%{release} + +Requires: %{product_id}-server = %{version}-%{release} Requires(post): systemd-units -Requires(preun): systemd-units Requires(postun): systemd-units # additional runtime requirements needed to run native 'tpsclient' @@ -691,8 +704,8 @@ Requires(postun): systemd-units Requires: nss-tools >= 3.36.1 Requires: openldap-clients -%description -n pki-tps -The Token Processing System (TPS) is an optional PKI subsystem that acts +%description -n %{product_id}-tps +%{product_name} Token Processing System (TPS) is an optional subsystem that acts as a Registration Authority (RA) for authenticating and processing enrollment requests, PIN reset requests, and formatting requests from the Enterprise Security Client (ESC). @@ -716,77 +729,78 @@ smart card. %if %{with javadoc} ################################################################################ -%package -n pki-javadoc +%package -n %{product_id}-javadoc ################################################################################ -Summary: PKI Javadoc Package +Summary: %{product_name} Javadoc Package BuildArch: noarch +Obsoletes: pki-javadoc < %{version}-%{release} +Provides: pki-javadoc = %{version}-%{release} + # Ensure we end up with a useful installation Conflicts: pki-base < %{version} Conflicts: pki-symkey < %{version} Conflicts: pki-server-theme < %{version} -%if %{with console} -Conflicts: pki-console-theme < %{version} -%endif -%description -n pki-javadoc -This package contains PKI API documentation. +%description -n %{product_id}-javadoc +This package provides %{product_name} API documentation. # with javadoc %endif %if %{with console} ################################################################################ -%package -n pki-console +%package -n %{product_id}-console ################################################################################ -Summary: PKI Console Package +Summary: %{product_name} Console Package BuildArch: noarch -BuildRequires: idm-console-framework >= 1.2.0 +BuildRequires: idm-console-framework >= 2.0 -Requires: idm-console-framework >= 1.2.0 -Requires: pki-base-java = %{version} -Requires: pki-console-theme = %{version} +Obsoletes: pki-console < %{version}-%{release} +Provides: pki-console = %{version}-%{release} -%description -n pki-console -The PKI Console is a Java application used to administer PKI server. +Requires: idm-console-framework >= 2.0 +Requires: %{product_id}-base-java = %{version}-%{release} +Requires: %{product_id}-console-theme = %{version}-%{release} + +%description -n %{product_id}-console +%{product_name} Console is a Java application used to administer %{product_name} Server. # with console %endif %if %{with theme} ################################################################################ -%package -n %{vendor_id}-pki-server-theme +%package -n %{product_id}-server-theme ################################################################################ -Summary: %{brand} PKI Server Theme Package +Summary: %{product_name} Server Theme Package BuildArch: noarch -Provides: pki-server-theme = %{version} +Obsoletes: pki-server-theme < %{version}-%{release} +Provides: pki-server-theme = %{version}-%{release} # Ensure we end up with a useful installation Conflicts: pki-base < %{version} Conflicts: pki-symkey < %{version} -%if %{with console} -Conflicts: pki-console-theme < %{version} -%endif Conflicts: pki-javadoc < %{version} -%description -n %{vendor_id}-pki-server-theme -This PKI Server Theme Package contains -%{brand} textual and graphical user interface for PKI Server. +%description -n %{product_id}-server-theme +This package provides theme files for %{product_name} Server. %if %{with console} ################################################################################ -%package -n %{vendor_id}-pki-console-theme +%package -n %{product_id}-console-theme ################################################################################ -Summary: %{brand} PKI Console Theme Package +Summary: %{product_name} Console Theme Package BuildArch: noarch -Provides: pki-console-theme = %{version} +Obsoletes: pki-console-theme < %{version}-%{release} +Provides: pki-console-theme = %{version}-%{release} # Ensure we end up with a useful installation Conflicts: pki-base < %{version} @@ -794,9 +808,8 @@ Conflicts: pki-symkey < %{version} Conflicts: pki-server-theme < %{version} Conflicts: pki-javadoc < %{version} -%description -n %{vendor_id}-pki-console-theme -This PKI Console Theme Package contains -%{brand} textual and graphical user interface for PKI Console. +%description -n %{product_id}-console-theme +This package provides theme files for %{product_name} Console. # with console %endif @@ -806,14 +819,20 @@ This PKI Console Theme Package contains %if %{with tests} ################################################################################ -%package -n pki-tests +%package -n %{product_id}-tests ################################################################################ -Summary: PKI Tests +Summary: %{product_name} Tests BuildArch: noarch -%description -n pki-tests -This package contains PKI test suite. +Obsoletes: pki-tests < %{version}-%{release} +Provides: pki-tests = %{version}-%{release} + +Requires: python3-pylint +Requires: python3-flake8 + +%description -n %{product_id}-tests +This package provides test suite for %{product_name}. # with tests %endif @@ -871,7 +890,7 @@ cd build -DWITH_JAVADOC:BOOL=%{?with_javadoc:ON}%{!?with_javadoc:OFF} \ -DWITH_TEST:BOOL=%{?with_test:ON}%{!?with_test:OFF} \ -DBUILD_PKI_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \ - -DTHEME=%{?with_theme:%{vendor_id}} \ + -DTHEME=%{?with_theme:%{theme}} \ %if 0%{?rhel} && 0%{?rhel} <= 8 .. %else @@ -918,7 +937,7 @@ ctest --output-on-failure cat > %{buildroot}%{_datadir}/doc/pki/README << EOF This package is a "meta-package" whose dependencies pull in all of the -packages comprising the %{brand} Public Key Infrastructure (PKI) Suite. +packages comprising the %{product_name} Suite. EOF # with meta @@ -948,7 +967,7 @@ ln -sf /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar %{buildroo %if %{with server} -%pre -n pki-server +%pre -n %{product_id}-server getent group %{pki_groupname} >/dev/null || groupadd -f -g %{pki_gid} -r %{pki_groupname} if ! getent passwd %{pki_username} >/dev/null ; then useradd -r -u %{pki_uid} -g %{pki_groupname} -d %{pki_homedir} -s /sbin/nologin -c "Certificate System" %{pki_username} @@ -960,7 +979,7 @@ exit 0 %if %{with base} -%post -n pki-base +%post -n %{product_id}-base if [ $1 -eq 1 ] then @@ -974,7 +993,7 @@ else echo >> /var/log/pki/pki-upgrade-%{version}.log fi -%postun -n pki-base +%postun -n %{product_id}-base if [ $1 -eq 0 ] then @@ -987,11 +1006,7 @@ fi %if %{with server} -%post -n pki-server -## NOTE: At this time, NO attempt has been made to update ANY PKI subsystem -## from EITHER 'sysVinit' OR previous 'systemd' processes to the new -## PKI deployment process - +%post -n %{product_id}-server # CVE-2021-3551 # Remove world access from existing installation logs find /var/log/pki -maxdepth 1 -type f -exec chmod o-rwx {} \; @@ -1002,24 +1017,13 @@ then systemctl daemon-reload fi -## preun -n pki-server -## NOTE: At this time, NO attempt has been made to update ANY PKI subsystem -## from EITHER 'sysVinit' OR previous 'systemd' processes to the new -## PKI deployment process - - -## postun -n pki-server -## NOTE: At this time, NO attempt has been made to update ANY PKI subsystem -## from EITHER 'sysVinit' OR previous 'systemd' processes to the new -## PKI deployment process - # with server %endif %if %{with meta} -%if "%{name}" != "%{vendor_id}-pki" +%if "%{name}" != "%{product_id}" ################################################################################ -%files -n %{vendor_id}-pki +%files -n %{product_id} ################################################################################ %else %files @@ -1032,7 +1036,7 @@ fi %if %{with base} ################################################################################ -%files -n pki-symkey +%files -n %{product_id}-symkey ################################################################################ %license base/symkey/LICENSE @@ -1040,7 +1044,7 @@ fi %{_libdir}/symkey/ ################################################################################ -%files -n pki-base +%files -n %{product_id}-base ################################################################################ %license base/common/LICENSE @@ -1066,7 +1070,7 @@ fi %{_mandir}/man8/pki-upgrade.8.gz ################################################################################ -%files -n pki-base-java +%files -n %{product_id}-base-java ################################################################################ %license base/common/LICENSE @@ -1078,7 +1082,7 @@ fi %{_javadir}/pki/pki-certsrv.jar ################################################################################ -%files -n python3-pki +%files -n python3-%{product_id} ################################################################################ %license base/common/LICENSE @@ -1089,7 +1093,7 @@ fi %{python3_sitelib}/pki ################################################################################ -%files -n pki-tools +%files -n %{product_id}-tools ################################################################################ %license base/tools/LICENSE @@ -1163,7 +1167,7 @@ fi %if %{with server} ################################################################################ -%files -n pki-server +%files -n %{product_id}-server ################################################################################ %license base/common/THIRD_PARTY_LICENSES @@ -1224,7 +1228,7 @@ fi %if %{with acme} ################################################################################ -%files -n pki-acme +%files -n %{product_id}-acme ################################################################################ %{_javadir}/pki/pki-acme.jar @@ -1235,7 +1239,7 @@ fi %if %{with ca} ################################################################################ -%files -n pki-ca +%files -n %{product_id}-ca ################################################################################ %license base/ca/LICENSE @@ -1247,7 +1251,7 @@ fi %if %{with kra} ################################################################################ -%files -n pki-kra +%files -n %{product_id}-kra ################################################################################ %license base/kra/LICENSE @@ -1259,7 +1263,7 @@ fi %if %{with ocsp} ################################################################################ -%files -n pki-ocsp +%files -n %{product_id}-ocsp ################################################################################ %license base/ocsp/LICENSE @@ -1271,7 +1275,7 @@ fi %if %{with tks} ################################################################################ -%files -n pki-tks +%files -n %{product_id}-tks ################################################################################ %license base/tks/LICENSE @@ -1283,7 +1287,7 @@ fi %if %{with tps} ################################################################################ -%files -n pki-tps +%files -n %{product_id}-tps ################################################################################ %license base/tps/LICENSE @@ -1305,17 +1309,17 @@ fi %if %{with javadoc} ################################################################################ -%files -n pki-javadoc +%files -n %{product_id}-javadoc ################################################################################ -%{_javadocdir}/pki-%{version}/ +%{_javadocdir}/pki/ # with javadoc %endif %if %{with console} ################################################################################ -%files -n pki-console +%files -n %{product_id}-console ################################################################################ %license base/console/LICENSE @@ -1327,10 +1331,10 @@ fi %if %{with theme} ################################################################################ -%files -n %{vendor_id}-pki-server-theme +%files -n %{product_id}-server-theme ################################################################################ -%license themes/%{vendor_id}/common-ui/LICENSE +%license themes/%{theme}/common-ui/LICENSE %dir %{_datadir}/pki %{_datadir}/pki/CS_SERVER_VERSION %{_datadir}/pki/common-ui/ @@ -1346,10 +1350,10 @@ fi %if %{with console} ################################################################################ -%files -n %{vendor_id}-pki-console-theme +%files -n %{product_id}-console-theme ################################################################################ -%license themes/%{vendor_id}/console-ui/LICENSE +%license themes/%{theme}/console-ui/LICENSE %{_javadir}/pki/pki-console-theme.jar # with console @@ -1360,7 +1364,7 @@ fi %if %{with tests} ################################################################################ -%files -n pki-tests +%files -n %{product_id}-tests ################################################################################ %{_datadir}/pki/tests/ @@ -1370,8 +1374,11 @@ fi ################################################################################ %changelog +* Thu Aug 12 2021 Dogtag PKI Team - 11.0.0-0.3.alpha2 +- Rebase to PKI 11.0.0-alpha2 + * Wed Jul 21 2021 Fedora Release Engineering - 11.0.0-0.2.alpha1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Tue Jun 22 2021 Dogtag PKI Team - 11.0.0-0.1 +* Tue Jun 22 2021 Dogtag PKI Team - 11.0.0-0.1.alpha1 - Rebase to PKI 11.0.0-alpha1 diff --git a/sources b/sources index 28bbe6b..111a1f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pki-11.0.0-alpha1.tar.gz) = 7dd458897d63a2aaba7e8cf62f74537cc7ba7798b5a5f6df5b6b3bee15ff00e1f6397540a23556eb25e86da3562d9723f66a14c619c25014e542a664023769d5 +SHA512 (pki-11.0.0-alpha2.tar.gz) = ea3c01e81bf8f63c7285d26685f6d426c1e5ade7055f7ee3753b1ba705d47fe6bd1c3d1e8879bb78e16890da0e990d54b59bf0b404d2d4cff2384065f9979672