diff --git a/.gitignore b/.gitignore index 87aa2ea..d9c4942 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/pki-10.11.0-alpha3.tar.gz +SOURCES/pki-10.11.0.tar.gz diff --git a/.pki-core.metadata b/.pki-core.metadata index 21eb60c..e5fd7ce 100644 --- a/.pki-core.metadata +++ b/.pki-core.metadata @@ -1 +1 @@ -a0707cfdb0ae99679e4d101261d8e2a59a90b6d7 SOURCES/pki-10.11.0-alpha3.tar.gz +f125333c7e88d7aae11f51527681018319bba19c SOURCES/pki-10.11.0.tar.gz diff --git a/SPECS/pki-core.spec b/SPECS/pki-core.spec index 0ada9fe..680e3b6 100644 --- a/SPECS/pki-core.spec +++ b/SPECS/pki-core.spec @@ -13,8 +13,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: 10.11.0 -Release: 0.3.alpha3%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha3 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +#global _phase -alpha1 # To create a tarball from a version tag: # $ git archive \ @@ -175,7 +175,7 @@ BuildRequires: zip BuildRequires: %{java_devel} BuildRequires: javapackages-tools BuildRequires: redhat-rpm-config -BuildRequires: ldapjdk >= 4.22.0 +BuildRequires: ldapjdk >= 4.23.0, ldapjdk < 5.0.0 BuildRequires: apache-commons-cli BuildRequires: apache-commons-codec BuildRequires: apache-commons-io @@ -198,17 +198,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 @@ -222,8 +212,8 @@ 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 >= 4.9.0, jss < 5.0.0 +BuildRequires: tomcatjss >= 7.7.0, tomcatjss < 8.0.0 BuildRequires: systemd-units @@ -291,22 +281,22 @@ 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} -Requires: %{vendor_id}-pki-console-theme = %{version} +Requires: %{vendor_id}-pki-server-theme = %{version}-%{release} +Requires: %{vendor_id}-pki-console-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: pki-acme = %{version}-%{release} +Requires: pki-ca = %{version}-%{release} +Requires: pki-kra = %{version}-%{release} +Requires: pki-ocsp = %{version}-%{release} +Requires: pki-tks = %{version}-%{release} +Requires: pki-tps = %{version}-%{release} # Make certain that this 'meta' package requires the latest version(s) # of PKI console -Requires: pki-console = %{version} -Requires: pki-javadoc = %{version} +Requires: pki-console = %{version}-%{release} +Requires: pki-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 @@ -345,7 +335,7 @@ Summary: PKI Symmetric Key Package Requires: %{java_headless} Requires: jpackage-utils >= 0:1.7.5-10 -Requires: jss >= 4.9.0 +Requires: jss >= 4.9.0, jss < 5.0.0 Requires: nss >= 3.38.0 # Ensure we end up with a useful installation @@ -388,7 +378,7 @@ Summary: PKI Python 3 Package BuildArch: noarch Obsoletes: pki-base-python3 < %{version} -Provides: pki-base-python3 = %{version} +Provides: pki-base-python3 = %{version}-%{release} %if 0%{?fedora} || 0%{?rhel} > 8 %{?python_provide:%python_provide python3-pki} %endif @@ -400,6 +390,9 @@ 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. @@ -422,8 +415,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 >= 4.9.0, jss < 5.0.0 +Requires: ldapjdk >= 4.23.0, ldapjdk < 5.0.0 Requires: pki-base = %{version}-%{release} %if 0%{?rhel} && 0%{?rhel} <= 8 @@ -510,7 +503,7 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires(pre): shadow-utils -Requires: tomcatjss >= 7.6.1 +Requires: tomcatjss >= 7.7.0, tomcatjss < 8.0.0 # pki-healthcheck depends on the following library %if 0%{?rhel} @@ -621,7 +614,7 @@ since such archival would undermine non-repudiation properties of signing keys. Summary: PKI OCSP Package BuildArch: noarch -Requires: pki-server = %{version} +Requires: pki-server = %{version}-%{release} Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -659,7 +652,7 @@ whenever they are issued or updated. Summary: PKI TKS Package BuildArch: noarch -Requires: pki-server = %{version} +Requires: pki-server = %{version}-%{release} Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -690,7 +683,7 @@ behind the firewall with restricted access. Summary: PKI TPS Package -Requires: pki-server = %{version} +Requires: pki-server = %{version}-%{release} Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -755,8 +748,8 @@ BuildArch: noarch BuildRequires: idm-console-framework >= 1.2.0 Requires: idm-console-framework >= 1.2.0 -Requires: pki-base-java = %{version} -Requires: pki-console-theme = %{version} +Requires: pki-base-java = %{version}-%{release} +Requires: pki-console-theme = %{version}-%{release} %description -n pki-console The PKI Console is a Java application used to administer PKI server. @@ -772,7 +765,7 @@ The PKI Console is a Java application used to administer PKI server. Summary: %{brand} PKI Server Theme Package BuildArch: noarch -Provides: pki-server-theme = %{version} +Provides: pki-server-theme = %{version}-%{release} # Ensure we end up with a useful installation Conflicts: pki-base < %{version} @@ -791,7 +784,7 @@ This PKI Server Theme Package contains Summary: %{brand} PKI Console Theme Package BuildArch: noarch -Provides: pki-console-theme = %{version} +Provides: pki-console-theme = %{version}-%{release} # Ensure we end up with a useful installation Conflicts: pki-base < %{version} @@ -928,14 +921,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 || 0%{?rhel} && 0%{?rhel} <= 8 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 || 0%{?rhel} && 0%{?rhel} <= 8 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 @@ -1360,6 +1361,9 @@ fi ################################################################################ %changelog +* Mon Jul 26 2021 Red Hat PKI Team 10.11.0-1 +- Rebase to PKI 10.11.0 + * Mon Jun 14 2021 Red Hat PKI Team 10.11.0-0.3 - Rebase to PKI 10.11.0-alpha3