From 8a37ee56f6803154bbced2adbc661e43e5515398 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Mon, 2 May 2022 11:29:35 -0500 Subject: [PATCH] Rebase to PKI 11.2.0-beta2 --- .gitignore | 1 + dogtag-pki.spec | 129 ++++++++++++++---------------------------------- sources | 2 +- 3 files changed, 38 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index 51c573d..a3119da 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /pki-11.1.0-alpha2.tar.gz /pki-11.1.0.tar.gz /pki-11.2.0-beta1.tar.gz +/pki-11.2.0-beta2.tar.gz diff --git a/dogtag-pki.spec b/dogtag-pki.spec index 22fcfe9..2cd24a4 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -6,16 +6,31 @@ Name: dogtag-pki %global product_id dogtag-pki %global theme dogtag +# Upstream version number: +%global major_version 11 +%global minor_version 2 +%global update_version 0 + +# Downstream release number: +# - development/stabilization (unsupported): 0. where n >= 1 +# - GA/update (supported): where n >= 1 +%global release_number 0.3 + +# Development phase: +# - development (unsupported): alpha where n >= 1 +# - stabilization (unsupported): beta where n >= 1 +# - GA/update (supported): +%global phase beta2 + +%undefine timestamp +%undefine commit_id + 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 - -# 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.2.0 -Release: 0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -beta1 +Version: %{major_version}.%{minor_version}.%{update_version} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -23,7 +38,7 @@ Release: 0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist} # --prefix pki-/ \ # -o pki-.tar.gz \ # -Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{version}%{?_phase}.tar.gz +Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?phase:-}%{?phase}/pki-%{version}%{?phase:-}%{?phase}.tar.gz # To create a patch for all changes since a version tag: # $ git format-patch \ @@ -32,13 +47,8 @@ Source: https://github.com/dogtagpki/pki/archive/v%{version}%{?_phase}/pki-%{ver # > pki-VERSION-RELEASE.patch # Patch: pki-VERSION-RELEASE.patch -# md2man isn't available on i686. Additionally, we aren't generally multi-lib -# compatible (https://fedoraproject.org/wiki/Packaging:Java) -# so dropping i686 everywhere but RHEL-8 (which we've already shipped) seems -# safest. -%if ! 0%{?rhel} || 0%{?rhel} > 8 +# Java 17 and md2man are not available on i686 ExcludeArch: i686 -%endif ################################################################################ # NSS @@ -50,11 +60,7 @@ ExcludeArch: i686 # Python ################################################################################ -%if 0%{?rhel} && 0%{?rhel} <= 8 -%global python_executable /usr/libexec/platform-python -%else %global python_executable /usr/bin/python3 -%endif ################################################################################ # Java @@ -189,7 +195,7 @@ BuildRequires: python3-six BuildRequires: junit BuildRequires: jpackage-utils >= 0:1.7.5-10 BuildRequires: jss >= 5.2.0 -BuildRequires: tomcatjss >= 8.1.0 +BuildRequires: tomcatjss >= 8.2.0 BuildRequires: ldapjdk >= 5.2.0 BuildRequires: systemd-units @@ -212,11 +218,7 @@ BuildRequires: zlib BuildRequires: zlib-devel # build dependency to build man pages -%if 0%{?fedora} && 0%{?fedora} <= 30 || 0%{?rhel} && 0%{?rhel} <= 8 -BuildRequires: go-md2man -%else BuildRequires: golang-github-cpuguy83-md2man -%endif # pki-healthcheck depends on the following library %if 0%{?rhel} @@ -342,9 +344,7 @@ 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: %{product_id}-base = %{version}-%{release} Requires: python3 >= 3.9 @@ -383,14 +383,9 @@ Requires: jpackage-utils >= 0:1.7.5-10 Requires: jss >= 5.2.0 Requires: ldapjdk >= 5.2.0 Requires: %{product_id}-base = %{version}-%{release} - -%if 0%{?rhel} && 0%{?rhel} <= 8 -Requires: resteasy >= 3.0.26 -%else Requires: resteasy-client >= 3.0.17-1 Requires: resteasy-core >= 3.0.17-1 Requires: resteasy-jackson2-provider >= 3.0.17-1 -%endif %description -n %{product_id}-java This package provides common and client libraries for Java. @@ -462,7 +457,7 @@ Requires: systemd Requires(post): systemd-units Requires(postun): systemd-units Requires(pre): shadow-utils -Requires: tomcatjss >= 8.1.0 +Requires: tomcatjss >= 8.2.0 # pki-healthcheck depends on the following library %if 0%{?rhel} @@ -801,43 +796,28 @@ This package provides test suite for %{product_name}. %prep ################################################################################ -%autosetup -n pki-%{version}%{?_phase} -p 1 +%autosetup -n pki-%{version}%{?phase:-}%{?phase} -p 1 ################################################################################ %build ################################################################################ -# get Java . version number -java_version=`%{java_home}/bin/java -XshowSettings:properties -version 2>&1 | sed -n 's/ *java.version *= *\([0-9]\+\.[0-9]\+\).*/\1/p'` - -# if == 1, get version number -# otherwise get version number -java_version=`echo $java_version | sed -e 's/^1\.//' -e 's/\..*$//'` - # assume tomcat app_server app_server=tomcat-9.0 -%if 0%{?rhel} && 0%{?rhel} <= 8 -%{__mkdir_p} build -cd build -%endif - %cmake \ --no-warn-unused-cli \ + -DPRODUCT_NAME="%{product_name}" \ -DVERSION=%{version}-%{release} \ -DVAR_INSTALL_DIR:PATH=/var \ -DP11_KIT_TRUST=/etc/alternatives/libnssckbi.so.%{_arch} \ - -DJAVA_VERSION=${java_version} \ -DJAVA_HOME=%{java_home} \ -DJAVA_LIB_INSTALL_DIR=%{_jnidir} \ -DSYSTEMD_LIB_INSTALL_DIR=%{_unitdir} \ -DAPP_SERVER=$app_server \ -DNSS_DEFAULT_DB_TYPE=%{nss_default_db_type} \ - -DBUILD_PKI_CORE:BOOL=ON \ -DPYTHON_EXECUTABLE=%{python_executable} \ -%if ! %{with server} && ! %{with acme} && ! %{with ca} && ! %{with kra} && ! %{with ocsp} && ! %{with tks} && ! %{with tps} - -DWITH_SERVER:BOOL=OFF \ -%endif + -DWITH_SERVER:BOOL=%{?with_server:ON}%{!?with_server:OFF} \ -DWITH_CA:BOOL=%{?with_ca:ON}%{!?with_ca:OFF} \ -DWITH_KRA:BOOL=%{?with_kra:ON}%{!?with_kra:OFF} \ -DWITH_OCSP:BOOL=%{?with_ocsp:ON}%{!?with_ocsp:OFF} \ @@ -845,18 +825,14 @@ cd build -DWITH_TPS:BOOL=%{?with_tps:ON}%{!?with_tps:OFF} \ -DWITH_ACME:BOOL=%{?with_acme:ON}%{!?with_acme:OFF} \ -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} \ + -DWITH_CONSOLE:BOOL=%{?with_console:ON}%{!?with_console:OFF} \ + -DWITH_TESTS:BOOL=%{?with_tests:ON}%{!?with_tests:OFF} \ + -DWITH_META:BOOL=%{?with_meta:ON}%{!?with_meta:OFF} \ -DTHEME=%{?with_theme:%{theme}} \ -%if 0%{?rhel} && 0%{?rhel} <= 8 - .. -%else + -DRUN_TESTS:BOOL=%{?with_test:ON}%{!?with_test:OFF} \ -B %{_vpath_builddir} -%endif -%if 0%{?fedora} || 0%{?rhel} > 8 cd %{_vpath_builddir} -%endif # Do not use _smp_mflags to preserve build order %{__make} \ @@ -871,11 +847,7 @@ cd %{_vpath_builddir} %install ################################################################################ -%if 0%{?rhel} && 0%{?rhel} <= 8 -cd build -%else cd %{_vpath_builddir} -%endif %{__make} \ VERBOSE=%{?_verbose} \ @@ -885,42 +857,10 @@ cd %{_vpath_builddir} --no-print-directory \ install -%if %{with test} +%if %{with tests} ctest --output-on-failure %endif -%if %{with meta} -%{__mkdir_p} %{buildroot}%{_datadir}/doc/pki - -cat > %{buildroot}%{_datadir}/doc/pki/README << EOF -This package is a "meta-package" whose dependencies pull in all of the -packages comprising the %{product_name} Suite. -EOF - -# with meta -%endif - -# Customize client library links in /usr/share/pki/lib -ln -sf /usr/share/java/jboss-logging/jboss-logging.jar %{buildroot}%{_datadir}/pki/lib/jboss-logging.jar -%if 0%{?fedora} && 0%{?fedora} <= 34 -ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar %{buildroot}%{_datadir}/pki/lib/jboss-annotations-api_1.2_spec.jar -%else -ln -sf /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar %{buildroot}%{_datadir}/pki/lib/jakarta.annotation-api.jar -%endif - -%if %{with server} - -# Customize server common library links in /usr/share/pki/server/common/lib -ln -sf /usr/share/java/jboss-logging/jboss-logging.jar %{buildroot}%{_datadir}/pki/server/common/lib/jboss-logging.jar -%if 0%{?fedora} && 0%{?fedora} <= 34 -ln -sf /usr/share/java/jboss-annotations-1.2-api/jboss-annotations-api_1.2_spec.jar %{buildroot}%{_datadir}/pki/server/common/lib/jboss-annotations-api_1.2_spec.jar -%else -ln -sf /usr/share/java/jakarta-annotations/jakarta.annotation-api.jar %{buildroot}%{_datadir}/pki/server/common/lib/jakarta.annotation-api.jar -%endif - -# with server -%endif - %if %{with server} %pre -n %{product_id}-server @@ -1318,6 +1258,9 @@ fi ################################################################################ %changelog +* Mon May 02 2022 Dogtag PKI Team - 11.2.0-0.3.beta2 +- Rebase to PKI 11.2.0-beta2 + * Tue Apr 12 2022 Dogtag PKI Team - 11.2.0-0.2.beta1 - Rebase to PKI 11.2.0-beta1 diff --git a/sources b/sources index 4e3115b..cbd24a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pki-11.2.0-beta1.tar.gz) = f7178276b5c465fb5adb13539dfe1eb8feae31aa8b46cd18d8b7f1036c283493a46aead186f5d2c5f0f5d24931b3fc4c7f6b33bc5c573fe41f657d840cf97330 +SHA512 (pki-11.2.0-beta2.tar.gz) = 2ad5820b1dc6a18ab7c3f8eb0f1922059350bc9143d531e90029903d74325604e0bb6c980989f78fdeea6f557541c76b1306d5ed93e0ed87f1f95f8def1494be