From e872dc657680dbbef7a6e69c162c1ab8c6cde994 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 16 Aug 2023 16:30:29 +0200 Subject: [PATCH 1/2] packaging: install tzdata-java or timezone-java According to https://pkgs.org/download/tzdata-java the package name is tzdata-java on some OSes, but timezone-java on some other OSes (e.g openSUSE Leap 15.4) --- packaging/centos7/cloud.spec | 6 +++--- packaging/centos8/cloud.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index c6ae6a63ae5a..b5947c1281b3 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -61,7 +61,7 @@ intelligent IaaS cloud implementation. %package management Summary: CloudStack management server UI Requires: java-11-openjdk -Requires: tzdata-java +Requires: (tzdata-java or timezone-java) Requires: python Requires: python3 Requires: bash @@ -108,7 +108,7 @@ The Apache CloudStack files shared between agent and management server Summary: CloudStack Agent for KVM hypervisors Requires: openssh-clients Requires: java-11-openjdk -Requires: tzdata-java +Requires: (tzdata-java or timezone-java) Requires: %{name}-common = %{_ver} Requires: libvirt Requires: bridge-utils @@ -144,7 +144,7 @@ The CloudStack baremetal agent %package usage Summary: CloudStack Usage calculation server Requires: java-11-openjdk -Requires: tzdata-java +Requires: (tzdata-java or timezone-java) Group: System Environment/Libraries %description usage The CloudStack usage calculation service diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec index fdaf155ed736..8d567f217ce7 100644 --- a/packaging/centos8/cloud.spec +++ b/packaging/centos8/cloud.spec @@ -53,7 +53,7 @@ intelligent IaaS cloud implementation. %package management Summary: CloudStack management server UI Requires: java-11-openjdk -Requires: tzdata-java +Requires: (tzdata-java or timezone-java) Requires: python3 Requires: bash Requires: gawk From 1ac17cbaf74282db5850e83bf2f165f82a198dd3 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 16 Aug 2023 20:33:09 +0200 Subject: [PATCH 2/2] revert cloud.spec for cento7 --- packaging/centos7/cloud.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index b5947c1281b3..c6ae6a63ae5a 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -61,7 +61,7 @@ intelligent IaaS cloud implementation. %package management Summary: CloudStack management server UI Requires: java-11-openjdk -Requires: (tzdata-java or timezone-java) +Requires: tzdata-java Requires: python Requires: python3 Requires: bash @@ -108,7 +108,7 @@ The Apache CloudStack files shared between agent and management server Summary: CloudStack Agent for KVM hypervisors Requires: openssh-clients Requires: java-11-openjdk -Requires: (tzdata-java or timezone-java) +Requires: tzdata-java Requires: %{name}-common = %{_ver} Requires: libvirt Requires: bridge-utils @@ -144,7 +144,7 @@ The CloudStack baremetal agent %package usage Summary: CloudStack Usage calculation server Requires: java-11-openjdk -Requires: (tzdata-java or timezone-java) +Requires: tzdata-java Group: System Environment/Libraries %description usage The CloudStack usage calculation service