[deltacloud-core/f15] Fix Fedora-15 to bring in vsphere package.

Chris Lalancette clalance at fedoraproject.org
Thu Sep 15 17:58:37 UTC 2011 

commit de74c30fbab294cfe446dbf08ba4e7add6b4a3b7
Author: Chris Lalancette <clalance at redhat.com>
Date:   Thu Sep 15 12:46:23 2011 -0400

    Fix Fedora-15 to bring in vsphere package.
    
    Signed-off-by: Chris Lalancette <clalance at redhat.com>

 deltacloud-core.spec |  133 +++++++++++++++++++++++++++++++++++++++++++------
 sources              |    4 +-
 2 files changed, 118 insertions(+), 19 deletions(-)
---
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index 1992879..d57ea8c 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -3,7 +3,7 @@
 Summary: Deltacloud REST API
 Name: deltacloud-core
 Version: 0.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
 URL: http://incubator.apache.org/deltacloud
@@ -40,6 +40,7 @@ BuildRequires: rubygem(rspec) >= 1.3.0
 BuildRequires: rubygem(json) >= 1.4.0
 BuildArch: noarch
 Provides: rubygem(deltacloud-core)
+Provides: deltacloud-core-mock
 
 %description
 The Deltacloud API is built as a service-based REST API.
@@ -55,15 +56,49 @@ Requires: %{name} = %{version}-%{release}
 %description doc
 Documentation for %{name}
 
-#%package azure
+%package all
+Summary: Deltacloud Core with all drivers
+Requires: %{name} = %{version}-%{release}
+#Requires: %{name}-azure = %{version}-%{release}
+#Requires: %{name}-condor = %{version}-%{release}
+Requires: %{name}-ec2 = %{version}-%{release}
+Requires: %{name}-eucalyptus = %{version}-%{release}
+Requires: %{name}-gogrid = %{version}-%{release}
+Requires: %{name}-opennebula = %{version}-%{release}
+Requires: %{name}-rackspace = %{version}-%{release}
+Requires: %{name}-rimuhosting = %{version}-%{release}
+Requires: %{name}-rhevm = %{version}-%{release}
+Requires: %{name}-sbc = %{version}-%{release}
+#Requires: %{name}-terremark = %{version}-%{release}
+Requires: %{name}-vsphere = %{version}-%{release}
+
+%description all
+Deltacloud core with all available drivers
+
+# FIXME: Azure requires waz-blobs gem which is not yet included in Fedora repos
+#
+#% package azure
 #Summary: Deltacloud Core for Azure
 #Requires: %{name} = %{version}-%{release}
 #Requires: rubygem(waz-blobs)
 
-#%description azure
+#% description azure
 #The azure sub-package brings in all dependencies necessary to use deltacloud
 #core to connect to Azure.
 
+# FIXME: the required packages are not yet in Fedora, so disable condor for now
+#% package condor
+#Summary: Deltacloud Core for CondorCloud
+#Requires: %{name} = %{version}-%{release}
+#Requires: rubygem(uuid)
+#Requires: rubygem(rest-client)
+#Requires: condor >= 7.4.0
+#Requires: condor-vm-gahp >= 7.4.0
+
+#% description condor
+#The condor sub-package brings in all dependencies necessary to use deltacloud core
+#to connect to CondorCloud.
+
 %package ec2
 Summary: Deltacloud Core for EC2
 Requires: %{name} = %{version}-%{release}
@@ -73,6 +108,15 @@ Requires: rubygem(aws)
 The ec2 sub-package brings in all dependencies necessary to use deltacloud
 core to connect to EC2.
 
+%package eucalyptus
+Summary: Deltacloud Core for Eucalyptus
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(aws)
+
+%description eucalyptus
+The eucalyptus sub-package brings in all dependencies necessary to use deltacloud
+core to connect to EC2.
+
 %package gogrid
 Summary: Deltacloud Core for GoGrid
 Requires: %{name} = %{version}-%{release}
@@ -81,14 +125,6 @@ Requires: %{name} = %{version}-%{release}
 The gogrid sub-package brings in all dependencies necessary to use deltacloud
 core to connect to GoGrid.
 
-%package mock
-Summary: Deltacloud Core for Mock
-Requires: %{name} = %{version}-%{release}
-
-%description mock
-The mock sub-package brings in all dependencies necessary to use deltacloud
-core to connect to Mock.
-
 %package opennebula
 Summary: Deltacloud Core for OpenNebula
 Requires: %{name} = %{version}-%{release}
@@ -132,16 +168,25 @@ Requires: %{name} = %{version}-%{release}
 The sbc sub-package brings in all dependencies necessary to use deltacloud core
 to connect to SBC.
 
-#%package terremark
+#% package terremark
 #Summary: Deltacloud Core for Terremark
 #Requires: %{name} = %{version}-%{release}
 #Requires: rubygem(fog)
 #Requires: rubygem(excon)
 
-#%description terremark
+#% description terremark
 #The terremark sub-package brings in all dependencies necessary to use deltacloud
 #core to connect to Terremark.
 
+%package vsphere
+Summary: Deltacloud Core for vSphere
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(rbvmomi)
+
+%description vsphere
+The vsphere sub-package brings in all dependencies necessary to use deltacloud
+core to connect to VMware vSphere.
+
 %prep
 %setup -q -c -T
 gem unpack -V --target=%{_builddir} %{SOURCE0}
@@ -165,11 +210,34 @@ chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 chmod 0755 %{buildroot}%{_initddir}/%{name}
 chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
 rm -rf %{buildroot}%{app_root}/support
+
+# temporarily remove Azure drivers until all dependencies will be pushed in to Fedora
+rm -rf %{buildroot}%{app_root}/config/drivers/azure.yaml
+
+# temporarily remove condor support files until we enable condor
+rm -f %{buildroot}%{app_root}/config/addresses.xml
+rm -f %{buildroot}%{app_root}/config/condor.yaml
+rm -f %{buildroot}%{app_root}/config/drivers/condor.yaml
+
+# temporarily remove terremark support files until we enable terremark
+rm -f %{buildroot}%{app_root}/config/drivers/terremark.yaml
+
 rdoc --op %{buildroot}%{_defaultdocdir}/%{name}
+
 mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
 
+#% install condor
+#install -m 0655 %{buildroot}%{app_root}/support/condor/config/condor-cloud \
+#  %{buildroot}%{_sysconfdir}/sysconfig/condor-cloud
+#install -m 0655 %{buildroot}%{app_root}/support/condor/config/50* \
+#  %{buildroot}%{_sysconfdir}/condor/config.d
+#install -m 0755 %{buildroot}%{app_root}/support/condor/bash/* \
+#  %{buildroot}%{_libexecdir}/condor
+#rm -rf %{buildroot}%{app_root}/support/condor
+
 %check
 pushd %{buildroot}%{app_root}
+rake mock:fixtures:clean
 rake test:mock
 popd
 
@@ -200,7 +268,8 @@ fi
 %{app_root}/*.rb
 %{app_root}/views
 %{app_root}/lib
-%{app_root}/config
+%dir %{app_root}/config/drivers
+%{app_root}/config/drivers/mock.yaml
 %dir %{app_root}/public
 %{app_root}/public/images
 %{app_root}/public/stylesheets
@@ -218,27 +287,57 @@ fi
 %{app_root}/%{name}.gemspec
 %{app_root}/Rakefile
 
+%files all
+
 #%files azure
 
+#%files condor
+#%{app_root}/config/drivers/condor.yaml
+#%{app_root}/config/condor.yaml
+#%{app_root}/config/addresses.xml
+#%%config(noreplace) %{_sysconfdir}/sysconfig/condor-cloud
+#%%config(noreplace) %{_sysconfdir}/condor/config.d/50condor_cloud.config
+#%%config(noreplace) %{_sysconfdir}/condor/config.d/50condor_cloud_node.config
+#%{_libexecdir}/condor/cached_images.sh
+#%{_libexecdir}/condor/cloud_exit_hook.sh
+#%{_libexecdir}/condor/cloud_functions
+#%{_libexecdir}/condor/cloud_prepare_hook.sh
+#%{_libexecdir}/condor/libvirt_cloud_script.sh
+
 %files ec2
+%{app_root}/config/drivers/ec2.yaml
 
-%files gogrid
+%files eucalyptus
+%{app_root}/config/drivers/eucalyptus.yaml
 
-%files mock
+%files gogrid
+%{app_root}/config/drivers/gogrid.yaml
 
 %files opennebula
+%{app_root}/config/drivers/opennebula.yaml
 
 %files rackspace
+%{app_root}/config/drivers/rackspace.yaml
 
 %files rhevm
+%{app_root}/config/drivers/rhevm.yaml
 
 %files rimuhosting
+%{app_root}/config/drivers/rimuhosting.yaml
 
 %files sbc
+%{app_root}/config/drivers/sbc.yaml
+
+#% files terremark
+#%{app_root}/config/drivers/terremark.yaml
 
-#%files terremark
+%files vsphere
+%{app_root}/config/drivers/vsphere.yaml
 
 %changelog
+* Thu Sep 15 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-3
+- Update specfile to bring in vsphere
+
 * Thu Sep 15 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.0-2
 - Updated release tag to not conflict with nightly builds
 - Removed obsoleted patches from spec file
diff --git a/sources b/sources
index 7c33570..0321247 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 b14213ac9ea2a550db5e74c9d074c7c9  deltacloudd-fedora
-ffc61394986f6db4259cecba0b66e084  deltacloud-core-config
-e9487309e4c18e328e119310c712b6fb  deltacloud-core.init
+abeb7376c76aefa5090414740330124e  deltacloud-core-config
 d07fcd383cbd13828f26534c97a855fc  deltacloud-core-0.4.0.gem
+e9487309e4c18e328e119310c712b6fb  deltacloud-core.init

More information about the scm-commits mailing list