From 788db9a35b173bf47651f886e7d7d3eabfdde23f Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 22 Jun 2021 18:02:47 -0500 Subject: [PATCH] Rebase to PKI 11.0.0-alpha1 --- .gitignore | 1 + dogtag-pki.spec | 144 +++++++++++++++--------------------------------- sources | 2 +- 3 files changed, 46 insertions(+), 101 deletions(-) diff --git a/.gitignore b/.gitignore index 0e8da83..f061852 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /pki-10.10.5.tar.gz /pki-10.11.0-alpha1.tar.gz /pki-10.11.0-alpha2.tar.gz +/pki-11.0.0-alpha1.tar.gz diff --git a/dogtag-pki.spec b/dogtag-pki.spec index 9048589..e666da3 100644 --- a/dogtag-pki.spec +++ b/dogtag-pki.spec @@ -12,9 +12,9 @@ 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: 10.11.0 -Release: 0.4.alpha2%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha2 +Version: 11.0.0 +Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist} +%global _phase -alpha1 # To create a tarball from a version tag: # $ git archive \ @@ -74,11 +74,12 @@ ExcludeArch: i686 # PKI ################################################################################ -# By default the build will execute unit tests unless --without test -# option is specified. - +# Execute unit tests unless --without test is specified. %bcond_without test +# Don't build console unless --with console is specified. +%bcond_with console + # By default all packages will be built except the ones specified with # --without option (exclusion method). @@ -113,8 +114,6 @@ ExcludeArch: i686 %global with_tps 1 # package_option javadoc %global with_javadoc 1 -# package_option console -%global with_console 1 # package_option theme %global with_theme 1 # package_option meta @@ -170,7 +169,6 @@ BuildRequires: zip BuildRequires: %{java_devel} BuildRequires: javapackages-tools BuildRequires: redhat-rpm-config -BuildRequires: ldapjdk >= 4.22.0 BuildRequires: apache-commons-cli BuildRequires: apache-commons-codec BuildRequires: apache-commons-io @@ -193,17 +191,7 @@ BuildRequires: python3-sphinx BuildRequires: xalan-j2 BuildRequires: xerces-j2 -%if 0%{?rhel} && ! 0%{?eln} BuildRequires: resteasy >= 3.0.26 -%else -BuildRequires: jboss-annotations-1.2-api -BuildRequires: jboss-jaxrs-2.0-api -BuildRequires: jboss-logging -BuildRequires: resteasy-client >= 3.0.17-1 -BuildRequires: resteasy-jaxb-provider >= 3.0.17-1 -BuildRequires: resteasy-core >= 3.0.17-1 -BuildRequires: resteasy-jackson2-provider >= 3.0.17-1 -%endif BuildRequires: python3 >= 3.5 BuildRequires: python3-devel @@ -217,8 +205,9 @@ BuildRequires: python3-six BuildRequires: junit BuildRequires: jpackage-utils >= 0:1.7.5-10 -BuildRequires: jss >= 4.9.0 -BuildRequires: tomcatjss >= 7.6.1 +BuildRequires: jss >= 5.0.0 +BuildRequires: tomcatjss >= 8.0.0 +BuildRequires: ldapjdk >= 5.0.0 BuildRequires: systemd-units @@ -287,7 +276,9 @@ Summary: %{brand} PKI Package # 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 # Make certain that this 'meta' package requires the latest version(s) # of ALL PKI core packages @@ -300,7 +291,9 @@ Requires: pki-tps = %{version} # 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} # Make certain that this 'meta' package requires the latest version(s) @@ -340,14 +333,16 @@ Summary: PKI Symmetric Key Package Requires: %{java_headless} Requires: jpackage-utils >= 0:1.7.5-10 -Requires: jss >= 4.9.0 +Requires: jss >= 5.0.0 Requires: nss >= 3.38.0 # Ensure we end up with a useful installation 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 @@ -369,7 +364,9 @@ 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 @@ -417,8 +414,8 @@ Requires: glassfish-jaxb-api Requires: slf4j Requires: slf4j-jdk14 Requires: jpackage-utils >= 0:1.7.5-10 -Requires: jss >= 4.9.0 -Requires: ldapjdk >= 4.22.0 +Requires: jss >= 5.0.0 +Requires: ldapjdk >= 5.0.0 Requires: pki-base = %{version}-%{release} %if 0%{?rhel} && 0%{?rhel} <= 8 @@ -432,7 +429,6 @@ Requires: resteasy-jackson2-provider >= 3.0.17-1 %if 0%{?fedora} >= 33 || 0%{?rhel} > 8 Requires: jaxb-impl >= 2.3.3 -Requires: jakarta-activation >= 1.2.2 %endif Requires: xalan-j2 @@ -504,7 +500,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires(pre): shadow-utils -Requires: tomcatjss >= 7.6.1 +Requires: tomcatjss >= 8.0.0 # pki-healthcheck depends on the following library %if 0%{?rhel} @@ -730,7 +726,9 @@ BuildArch: noarch 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. @@ -771,13 +769,16 @@ Provides: pki-server-theme = %{version} # 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. +%if %{with console} ################################################################################ %package -n %{vendor_id}-pki-console-theme ################################################################################ @@ -797,6 +798,9 @@ Conflicts: pki-javadoc < %{version} This PKI Console Theme Package contains %{brand} textual and graphical user interface for PKI Console. +# with console +%endif + # with theme %endif @@ -922,14 +926,22 @@ EOF # 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 %{jaxrs_api_jar} %{buildroot}%{_datadir}/pki/server/common/lib/jboss-jaxrs-2.0-api.jar 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 @@ -1332,6 +1344,7 @@ fi %{_datadir}/pki/server/webapps/pki/pki.properties %{_datadir}/pki/server/webapps/pki/tks +%if %{with console} ################################################################################ %files -n %{vendor_id}-pki-console-theme ################################################################################ @@ -1339,6 +1352,9 @@ fi %license themes/%{vendor_id}/console-ui/LICENSE %{_javadir}/pki/pki-console-theme.jar +# with console +%endif + # with theme %endif @@ -1354,77 +1370,5 @@ fi ################################################################################ %changelog -* Thu Jun 10 2021 Dogtag PKI Team - 10.11.0-0.4 -- Rebase to PKI 10.11.0-alpha2 - -* Tue Jun 1 2021 Dogtag PKI Team - 10.11.0-0.2 -- Drop git dependency -- Disable unit tests by default - -* Tue May 18 2021 Dogtag PKI Team - 10.11.0-0.1 -- Rebase to PKI 10.11.0-alpha1 - -* Wed Mar 10 2021 Dogtag PKI Team - 10.10.5-3 -- Use tomcat instead of pki-servlet-engine in ELN - -* Wed Mar 10 2021 Dogtag PKI Team - 10.10.5-2 -- Drop dependency on esc for s390(x) architectures - -* Thu Feb 25 2021 Dogtag PKI Team - 10.10.5-1 -- Rebase to upstream stable v10.10.5 release - -* Tue Jan 26 2021 Fedora Release Engineering - 10.10.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 14 2021 Dogtag PKI Team - 10.10.3-1 -- Rebase to upstream stable v10.10.3 release - -* Fri Oct 30 2020 Dogtag PKI Team - 10.10.0-1 -- Rebase to upstream stable v10.10.0-1 release - -* Thu Oct 22 2020 Dogtag PKI Team - 10.10.0-0.2 -- Rebase to upstream beta v10.10.0-b2 release - -* Fri Sep 11 2020 Dogtag PKI Team - 10.9.4-1 -- Rebase to stable upstream v10.9.4 release - -* Tue Aug 18 2020 Dogtag PKI Team - 10.9.2-1 -- Second attempt at JDK11 Support - -* Tue Aug 18 2020 Dogtag PKI Team - 10.9.1-2 -- Rebuilt to fix packaging issues introduced upstream - -* Sat Aug 01 2020 Fedora Release Engineering - 10.9.0-0.6 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 10.9.0-0.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jun 30 2020 Dogtag PKI Team - 10.9.0-0.4 -- Rebase to upstream beta version v10.9.0-b2 - -* Wed Jun 10 2020 Dogtag PKI Team - 10.9.0-0.2 -- Rebase to upstream alpha version 10.9.0-a2 - -* Thu Mar 05 2020 Dogtag PKI Team - 10.8.3-1 -- Rebase to latest upstream version -- Spec cleanup to match with upstream spec - -* Tue Jan 28 2020 Fedora Release Engineering - 10.7.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Aug 14 2019 Dogtag PKI Team - 10.7.3-3 -- Rebuild with patches applied - -* Wed Aug 14 2019 Dogtag PKI Team - 10.7.3-2 -- Fix URL redirection for KRA and OCSP web UI - -* Thu Aug 08 2019 Dogtag PKI Team - 10.7.3-1 -- Rebased to PKI 10.7.3 - -* Wed Jul 24 2019 Fedora Release Engineering - 10.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue May 07 2019 Dogtag PKI Team - 10.7.0-1 -- Rebased to PKI 10.7.0 +* Tue Jun 22 2021 Dogtag PKI Team - 11.0.0-0.1 +- Rebase to PKI 11.0.0-alpha1 diff --git a/sources b/sources index 40f2823..28bbe6b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pki-10.11.0-alpha2.tar.gz) = 1c80effcc4d4516b8e6f1405425913e68d3f4931da0aff796fed297041944d0a4d5239249353d6ece8e8306a118a9cc2439896f49c1731e989d0a8c310acf1a4 +SHA512 (pki-11.0.0-alpha1.tar.gz) = 7dd458897d63a2aaba7e8cf62f74537cc7ba7798b5a5f6df5b6b3bee15ff00e1f6397540a23556eb25e86da3562d9723f66a14c619c25014e542a664023769d5