Rebase to PKI 11.1.0-alpha2
This commit is contained in:
Chris Kelley
parent
cfe5c602fa
commit
7c8d7b6839
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,3 +24,4 @@
|
||||
/pki-11.0.0-alpha2.tar.gz
|
||||
/pki-11.0.0-beta1.tar.gz
|
||||
/pki-11.0.0.tar.gz
|
||||
/pki-11.1.0-alpha2.tar.gz
|
||||
|
||||
@ -13,9 +13,9 @@ License: GPLv2 and LGPLv2
|
||||
|
||||
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
|
||||
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
|
||||
Version: 11.0.0
|
||||
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
|
||||
#global _phase -alpha1
|
||||
Version: 11.1.0
|
||||
Release: 0.1.alpha2%{?_timestamp}%{?_commit_id}%{?dist}
|
||||
%global _phase -alpha2
|
||||
|
||||
# To create a tarball from a version tag:
|
||||
# $ git archive \
|
||||
@ -60,9 +60,9 @@ ExcludeArch: i686
|
||||
# Java
|
||||
################################################################################
|
||||
|
||||
%define java_devel java-11-openjdk-devel
|
||||
%define java_headless java-11-openjdk-headless
|
||||
%define java_home /usr/lib/jvm/jre-11-openjdk
|
||||
%define java_devel java-17-openjdk-devel
|
||||
%define java_headless java-17-openjdk-headless
|
||||
%define java_home %{_jvmdir}/jre-17-openjdk
|
||||
|
||||
################################################################################
|
||||
# RESTEasy
|
||||
@ -181,12 +181,9 @@ BuildRequires: policycoreutils
|
||||
BuildRequires: python3-lxml
|
||||
BuildRequires: python3-sphinx
|
||||
|
||||
BuildRequires: xalan-j2
|
||||
BuildRequires: xerces-j2
|
||||
|
||||
BuildRequires: resteasy >= 3.0.26
|
||||
|
||||
BuildRequires: python3 >= 3.5
|
||||
BuildRequires: python3 >= 3.9
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-cryptography
|
||||
@ -198,16 +195,16 @@ BuildRequires: python3-six
|
||||
|
||||
BuildRequires: junit
|
||||
BuildRequires: jpackage-utils >= 0:1.7.5-10
|
||||
BuildRequires: jss >= 5.0.0
|
||||
BuildRequires: jss >= 5.1.0
|
||||
BuildRequires: tomcatjss >= 8.0.0
|
||||
BuildRequires: ldapjdk >= 5.0.0
|
||||
|
||||
BuildRequires: systemd-units
|
||||
|
||||
%if 0%{?rhel} && ! 0%{?eln}
|
||||
BuildRequires: pki-servlet-engine
|
||||
BuildRequires: pki-servlet-engine >= 9.0.31
|
||||
%else
|
||||
BuildRequires: tomcat >= 1:9.0.7
|
||||
BuildRequires: tomcat >= 1:9.0.31
|
||||
%endif
|
||||
|
||||
# additional build requirements needed to build native 'tpsclient'
|
||||
@ -272,7 +269,7 @@ Obsoletes: idm-console-framework < 2.0
|
||||
|
||||
# Make certain that this 'meta' package requires the latest version(s)
|
||||
# of ALL PKI theme packages
|
||||
Requires: %{product_id}-server-theme = %{version}-%{release}
|
||||
Requires: %{product_id}-theme = %{version}-%{release}
|
||||
|
||||
# Make certain that this 'meta' package requires the latest version(s)
|
||||
# of ALL PKI core packages
|
||||
@ -325,13 +322,14 @@ Provides: pki-symkey = %{version}-%{release}
|
||||
|
||||
Requires: %{java_headless}
|
||||
Requires: jpackage-utils >= 0:1.7.5-10
|
||||
Requires: jss >= 5.0.0
|
||||
Requires: jss >= 5.1.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}
|
||||
Conflicts: %{product_id}-theme < %{version}
|
||||
|
||||
%description -n %{product_id}-symkey
|
||||
This package provides library for symmetric key operations.
|
||||
@ -355,6 +353,7 @@ Requires(post): python3-pki = %{version}-%{release}
|
||||
Conflicts: pki-symkey < %{version}
|
||||
Conflicts: pki-javadoc < %{version}
|
||||
Conflicts: pki-server-theme < %{version}
|
||||
Conflicts: %{product_id}-theme < %{version}
|
||||
|
||||
%description -n %{product_id}-base
|
||||
This package provides default configuration files for %{product_name} client.
|
||||
@ -377,7 +376,7 @@ Provides: pki-base-python3 = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
Requires: %{product_id}-base = %{version}-%{release}
|
||||
Requires: python3 >= 3.5
|
||||
Requires: python3 >= 3.9
|
||||
Requires: python3-cryptography
|
||||
Requires: python3-ldap
|
||||
Requires: python3-lxml
|
||||
@ -388,7 +387,7 @@ Requires: python3-six
|
||||
This package provides common and client library for Python 3.
|
||||
|
||||
################################################################################
|
||||
%package -n %{product_id}-base-java
|
||||
%package -n %{product_id}-java
|
||||
################################################################################
|
||||
|
||||
Summary: %{product_name} Base Java Package
|
||||
@ -397,6 +396,9 @@ BuildArch: noarch
|
||||
Obsoletes: pki-base-java < %{version}-%{release}
|
||||
Provides: pki-base-java = %{version}-%{release}
|
||||
|
||||
Obsoletes: %{product_id}-base-java < %{version}-%{release}
|
||||
Provides: %{product_id}-base-java = %{version}-%{release}
|
||||
|
||||
Requires: %{java_headless}
|
||||
Requires: apache-commons-cli
|
||||
Requires: apache-commons-codec
|
||||
@ -407,7 +409,7 @@ Requires: apache-commons-net
|
||||
Requires: slf4j
|
||||
Requires: slf4j-jdk14
|
||||
Requires: jpackage-utils >= 0:1.7.5-10
|
||||
Requires: jss >= 5.0.0
|
||||
Requires: jss >= 5.1.0
|
||||
Requires: ldapjdk >= 5.0.0
|
||||
Requires: %{product_id}-base = %{version}-%{release}
|
||||
|
||||
@ -419,11 +421,7 @@ Requires: resteasy-core >= 3.0.17-1
|
||||
Requires: resteasy-jackson2-provider >= 3.0.17-1
|
||||
%endif
|
||||
|
||||
Requires: xalan-j2
|
||||
Requires: xerces-j2
|
||||
Requires: xml-commons-resolver
|
||||
|
||||
%description -n %{product_id}-base-java
|
||||
%description -n %{product_id}-java
|
||||
This package provides common and client libraries for Java.
|
||||
|
||||
################################################################################
|
||||
@ -437,7 +435,7 @@ Provides: pki-tools = %{version}-%{release}
|
||||
|
||||
Requires: openldap-clients
|
||||
Requires: nss-tools >= 3.36.1
|
||||
Requires: %{product_id}-base-java = %{version}-%{release}
|
||||
Requires: %{product_id}-java = %{version}-%{release}
|
||||
Requires: p11-kit-trust
|
||||
|
||||
# PKICertImport depends on certutil and openssl
|
||||
@ -482,9 +480,9 @@ Requires: python3-policycoreutils
|
||||
Requires: selinux-policy-targeted >= 3.13.1-159
|
||||
|
||||
%if 0%{?rhel} && ! 0%{?eln}
|
||||
Requires: pki-servlet-engine
|
||||
Requires: pki-servlet-engine >= 9.0.31
|
||||
%else
|
||||
Requires: tomcat >= 1:9.0.7
|
||||
Requires: tomcat >= 1:9.0.31
|
||||
%endif
|
||||
|
||||
Requires: systemd
|
||||
@ -732,6 +730,7 @@ Provides: pki-javadoc = %{version}-%{release}
|
||||
Conflicts: pki-base < %{version}
|
||||
Conflicts: pki-symkey < %{version}
|
||||
Conflicts: pki-server-theme < %{version}
|
||||
Conflicts: %{product_id}-theme < %{version}
|
||||
|
||||
%description -n %{product_id}-javadoc
|
||||
This package provides %{product_name} API documentation.
|
||||
@ -753,7 +752,7 @@ Obsoletes: pki-console < %{version}-%{release}
|
||||
Provides: pki-console = %{version}-%{release}
|
||||
|
||||
Requires: idm-console-framework >= 2.0
|
||||
Requires: %{product_id}-base-java = %{version}-%{release}
|
||||
Requires: %{product_id}-java = %{version}-%{release}
|
||||
Requires: %{product_id}-console-theme = %{version}-%{release}
|
||||
|
||||
%description -n %{product_id}-console
|
||||
@ -764,7 +763,7 @@ Requires: %{product_id}-console-theme = %{version}-%{release}
|
||||
|
||||
%if %{with theme}
|
||||
################################################################################
|
||||
%package -n %{product_id}-server-theme
|
||||
%package -n %{product_id}-theme
|
||||
################################################################################
|
||||
|
||||
Summary: %{product_name} Server Theme Package
|
||||
@ -773,13 +772,16 @@ BuildArch: noarch
|
||||
Obsoletes: pki-server-theme < %{version}-%{release}
|
||||
Provides: pki-server-theme = %{version}-%{release}
|
||||
|
||||
Obsoletes: %{product_id}-server-theme < %{version}-%{release}
|
||||
Provides: %{product_id}-server-theme = %{version}-%{release}
|
||||
|
||||
# Ensure we end up with a useful installation
|
||||
Conflicts: pki-base < %{version}
|
||||
Conflicts: pki-symkey < %{version}
|
||||
Conflicts: pki-javadoc < %{version}
|
||||
|
||||
%description -n %{product_id}-server-theme
|
||||
This package provides theme files for %{product_name} Server.
|
||||
%description -n %{product_id}-theme
|
||||
This package provides theme files for %{product_name}.
|
||||
|
||||
%if %{with console}
|
||||
################################################################################
|
||||
@ -797,6 +799,7 @@ Conflicts: pki-base < %{version}
|
||||
Conflicts: pki-symkey < %{version}
|
||||
Conflicts: pki-server-theme < %{version}
|
||||
Conflicts: pki-javadoc < %{version}
|
||||
Conflicts: %{product_id}-theme < %{version}
|
||||
|
||||
%description -n %{product_id}-console-theme
|
||||
This package provides theme files for %{product_name} Console.
|
||||
@ -1060,7 +1063,7 @@ fi
|
||||
%{_mandir}/man8/pki-upgrade.8.gz
|
||||
|
||||
################################################################################
|
||||
%files -n %{product_id}-base-java
|
||||
%files -n %{product_id}-java
|
||||
################################################################################
|
||||
|
||||
%license base/common/LICENSE
|
||||
@ -1322,7 +1325,7 @@ fi
|
||||
|
||||
%if %{with theme}
|
||||
################################################################################
|
||||
%files -n %{product_id}-server-theme
|
||||
%files -n %{product_id}-theme
|
||||
################################################################################
|
||||
|
||||
%license themes/%{theme}/common-ui/LICENSE
|
||||
@ -1365,6 +1368,9 @@ fi
|
||||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Fri Nov 26 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 11.1.0-0.1.alpha2
|
||||
- Rebase to PKI 11.1.0-alpha2
|
||||
|
||||
* Thu Sep 30 2021 Dogtag PKI Team <devel@lists.dogtagpki.org> - 11.0.0-1
|
||||
- Rebase to PKI 11.0.0
|
||||
- Bug #1999052 - pki instance creation fails for IPA server
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (pki-11.0.0.tar.gz) = 91d687b563d39c969f47aea96fde38d21a8068881fa39897aa961ff86053b2fba0cd69001500382f7cbfc737b7859e0204793e09d51befde6c2e6811d8e2b9fb
|
||||
SHA512 (pki-11.1.0-alpha2.tar.gz) = 96ed9f3043412bd861c93c906068c8533ebcc0c56ebf69ff67f8960ead55e3ba13e29125fb4be5eb5008ee57851e11ac8d78246820323a5077a384caa183f442
|
||||
|
||||
Loading…
Reference in New Issue
Block a user