apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

packaging: rpm related fixes

Browse Source 
CLOUDSTACK-7460: mgmt server package should not create agent directory
Revert "CLOUDSTACK-8402: Depend on openjdk 1.7 for both CentOS 6 and 7"
Revert "CLOUDSTACK-8404: uninstall/conflict if java-1.8.0-openjdk is installed"

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-05-05 15:20:02 +02:00
parent 0eb4eb2370
commit 25e555bd2d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/centos63/cloud.spec
View File

@ -63,7 +63,6 @@ intelligent IaaS cloud implementation.
Summary: CloudStack management server UI
Requires: %{_tomcatversion}
Requires: %{_javaversion}
Conflicts: java-1.8.0-openjdk
Requires: python
Requires: bash
Requires: bzip2
@ -118,7 +117,6 @@ The Apache CloudStack files shared between agent and management server
Summary: CloudStack Agent for KVM hypervisors
Requires: openssh-clients
Requires: %{_javaversion}
Conflicts: java-1.8.0-openjdk
Requires: %{name}-common = %{_ver}
Requires: libvirt
Requires: bridge-utils
@ -158,7 +156,6 @@ The CloudStack baremetal agent
%package usage
Summary: CloudStack Usage calculation server
Requires: %{_javaversion}
Conflicts: java-1.8.0-openjdk
Requires: jsvc
Requires: jakarta-commons-daemon
Requires: jakarta-commons-daemon-jsvc
@ -596,7 +593,6 @@ fi
%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work
%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp
%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent
%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties

4
packaging/centos63/rhel7/macros.spec
View File

@ -16,7 +16,7 @@
# under the License.
%define _pythonparamiko %{nil}
%define _javaversion java-1.7.0-openjdk
%define _javaversion java => 1.7.0
%define _tomcatversion tomcat => 7.0
%define _vlanconfigtool iproute
%define _tomcatpathname tomcat
@ -26,4 +26,4 @@
%define _iptablesservice Requires: iptables-services
%define _serverxmlname server7
%define _cloudstackmanagementconf install -D packaging/centos63/%{_os}/%{name}-management.conf ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}-management.conf
%define _cloudstackmanagementconfattr %attr(0755,root,root) %{_tmpfilesdir}/%{name}-management.conf
%define _cloudstackmanagementconfattr %attr(0755,root,root) %{_tmpfilesdir}/%{name}-management.conf