From 25e555bd2da8fa7846adfbee685c3c471b3b0dae Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Tue, 5 May 2015 15:20:02 +0200
Subject: [PATCH] packaging: rpm related fixes

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>
---
 packaging/centos63/cloud.spec        | 4 ----
 packaging/centos63/rhel7/macros.spec | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 04bc8051508..cfbe79dadc3 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -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
diff --git a/packaging/centos63/rhel7/macros.spec b/packaging/centos63/rhel7/macros.spec
index 7d7ee616b4c..309b2055306 100644
--- a/packaging/centos63/rhel7/macros.spec
+++ b/packaging/centos63/rhel7/macros.spec
@@ -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
\ No newline at end of file
+%define _cloudstackmanagementconfattr %attr(0755,root,root) %{_tmpfilesdir}/%{name}-management.conf