Skip to content

Commit e944458

Browse files
rohityadavclouddhslove
authored andcommitted
cloud.spec: provide option between tzdata-java and timezone-java (apache#11372)
This fixes packaging issue where CloudStack rpms cannot find tzdata-java on openSUSE/SLES platforms. Signed-off-by: Rohit Yadav <[email protected]>
1 parent 06c7a3c commit e944458

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

packaging/centos7/cloud.spec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ The Apache CloudStack files shared between agent and management server
109109

110110
%package agent
111111
Summary: CloudStack Agent for KVM hypervisors
112-
Requires: openssh-clients
113-
Requires: java-11-openjdk
114-
Requires: tzdata-java
112+
Requires: (openssh-clients or openssh)
113+
Requires: java-17-openjdk
114+
Requires: (tzdata-java or timezone-java)
115115
Requires: %{name}-common = %{_ver}
116116
Requires: libvirt
117117
Requires: bridge-utils
@@ -152,8 +152,8 @@ The CloudStack baremetal agent
152152

153153
%package usage
154154
Summary: CloudStack Usage calculation server
155-
Requires: java-11-openjdk
156-
Requires: tzdata-java
155+
Requires: java-17-openjdk
156+
Requires: (tzdata-java or timezone-java)
157157
Group: System Environment/Libraries
158158
%description usage
159159
The CloudStack usage calculation service

0 commit comments

Comments
 (0)