[29/30] git commit: Fix rpm build after kvm move

[al...@apache.org]

Fix rpm build after kvm move


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9c127cf6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9c127cf6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9c127cf6

Branch: refs/heads/vpc
Commit: 9c127cf6086766b9f3b23152c01dfc312a1e005b
Parents: eb116b6
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Thu Aug 2 11:56:33 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Thu Aug 2 11:56:33 2012 +0200

----------------------------------------------------------------------
 cloud.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9c127cf6/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index fcfa740..abb79bb 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -432,6 +432,9 @@ fi
 %{_javadir}/%{name}-plugin-nicira-nvp.jar
 %{_javadir}/%{name}-plugin-elb.jar
 %{_javadir}/%{name}-plugin-netapp.jar
+%{_javadir}/%{name}-plugin-hypervisor-kvm.jar
+   /usr/share/java/libvirt-0.4.8.jar
+
 %config(noreplace) %{_sysconfdir}/%{name}/server/*
 
 %files agent-scripts
@@ -456,7 +459,6 @@ fi
 %{_javadir}/%{name}-ehcache.jar
 %{_javadir}/%{name}-email.jar
 %{_javadir}/%{name}-httpcore-4.0.jar
-%{_javadir}/%{name}-libvirt-0.4.5.jar
 %{_javadir}/%{name}-log4j.jar
 %{_javadir}/%{name}-trilead-ssh2-build213.jar
 %{_javadir}/%{name}-cglib.jar
@@ -480,6 +482,7 @@ fi
 %{_javadir}/%{name}-jasypt-1.8.jar
 %{_javadir}/%{name}-commons-configuration-1.8.jar
 %{_javadir}/%{name}-commons-lang-2.6.jar
+%{_javadir}/libvirt-0.4.8.jar
 
 
 %files core
@@ -532,7 +535,6 @@ fi
 %files agent-libs
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-agent.jar
-%{_javadir}/%{name}-kvm.jar
 
 %files agent
 %defattr(0644,root,root,0755)
@@ -542,7 +544,6 @@ fi
 %config(noreplace)  %{_sysconfdir}/%{name}/agent/environment.properties
 %config(noreplace) %{_sysconfdir}/%{name}/agent/log4j-%{name}.xml
 %attr(0755,root,root) %{_initrddir}/%{name}-agent
-%attr(0755,root,root) %{_libexecdir}/agent-runner
 %attr(0755,root,root) %{_bindir}/%{name}-setup-agent
 %dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/agent
 %attr(0755,root,root) %{_bindir}/mycloud-setup-agent
@@ -563,7 +564,6 @@ fi
 %defattr(0644,root,root,0775)
 %{_javadir}/%{name}-usage.jar
 %attr(0755,root,root) %{_initrddir}/%{name}-usage
-%attr(0755,root,root) %{_libexecdir}/usage-runner
 %dir %attr(0770,root,%{name}) %{_localstatedir}/log/%{name}/usage
 %config(noreplace) %{_sysconfdir}/%{name}/usage/usage-components.xml
 %config(noreplace) %{_sysconfdir}/%{name}/usage/log4j-%{name}_usage.xml