You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/05/07 15:26:58 UTC
[2/3] git commit: updated refs/heads/GA-4.5.1 to 54f3e77
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 <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/25e555bd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/25e555bd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/25e555bd
Branch: refs/heads/GA-4.5.1
Commit: 25e555bd2da8fa7846adfbee685c3c471b3b0dae
Parents: 0eb4eb2
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue May 5 15:20:02 2015 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed May 6 01:46:21 2015 +0200
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 4 ----
packaging/centos63/rhel7/macros.spec | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25e555bd/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 04bc805..cfbe79d 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25e555bd/packaging/centos63/rhel7/macros.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/rhel7/macros.spec b/packaging/centos63/rhel7/macros.spec
index 7d7ee61..309b205 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