mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Revert "CLOUDSTACK-8402: EL7 rpms should depend on openjdk7"
This does not fail on centos7, reverting the fix. This reverts commit 52a0adad04d67555a50ab58662735039f438c7e0.
This commit is contained in:
parent
628dde7fd2
commit
3ac3534544
@ -60,7 +60,7 @@ intelligent IaaS cloud implementation.
|
|||||||
%package management
|
%package management
|
||||||
Summary: CloudStack management server UI
|
Summary: CloudStack management server UI
|
||||||
Requires: tomcat => 7.0
|
Requires: tomcat => 7.0
|
||||||
Requires: java-1.7.0-openjdk
|
Requires: java => 1.7.0
|
||||||
Requires: python
|
Requires: python
|
||||||
Requires: bash
|
Requires: bash
|
||||||
Requires: bzip2
|
Requires: bzip2
|
||||||
@ -99,7 +99,7 @@ The Apache CloudStack files shared between agent and management server
|
|||||||
%package agent
|
%package agent
|
||||||
Summary: CloudStack Agent for KVM hypervisors
|
Summary: CloudStack Agent for KVM hypervisors
|
||||||
Requires: openssh-clients
|
Requires: openssh-clients
|
||||||
Requires: java-1.7.0-openjdk
|
Requires: java => 1.7.0
|
||||||
Requires: %{name}-common = %{_ver}
|
Requires: %{name}-common = %{_ver}
|
||||||
Requires: libvirt
|
Requires: libvirt
|
||||||
Requires: bridge-utils
|
Requires: bridge-utils
|
||||||
@ -134,7 +134,7 @@ The CloudStack baremetal agent
|
|||||||
|
|
||||||
%package usage
|
%package usage
|
||||||
Summary: CloudStack Usage calculation server
|
Summary: CloudStack Usage calculation server
|
||||||
Requires: java-1.7.0-openjdk
|
Requires: java => 1.7.0
|
||||||
Requires: jsvc
|
Requires: jsvc
|
||||||
Requires: jakarta-commons-daemon
|
Requires: jakarta-commons-daemon
|
||||||
Requires: jakarta-commons-daemon-jsvc
|
Requires: jakarta-commons-daemon-jsvc
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user