[deltacloud-core] - Add patches to fix up deltacloud-core initscript - Clean up the specfile (sort subpackages in alph
Chris Lalancette
clalance at fedoraproject.org
Wed Sep 14 14:39:09 UTC 2011
commit b994b4c179e216a888d1ad29a03858891dcb837f
Author: Chris Lalancette <clalance at redhat.com>
Date: Wed Sep 14 10:11:13 2011 -0400
- Add patches to fix up deltacloud-core initscript
- Clean up the specfile (sort subpackages in alphabetical order)
- Disable deltacloud-core-condor subpackage for now (since it doesn't work)
- Make sure the log directory is owned by nobody:nobody
Signed-off-by: Chris Lalancette <clalance at redhat.com>
.gitignore | 2 +-
deltacloud-core.spec | 140 +++++++++++++++++++++++++++++--------------------
sources | 2 +-
3 files changed, 85 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 01cecb4..b5c7d74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,8 @@
/fix_load_balancers.patch
/deltacloudd-fedora
/fix_rhevm_memory_calculation.patch
-/deltacloud-core
/deltacloud-core-config
/rhevm-long-username.patch
/rhevm-long-username-fix.patch
/deltacloud-core-0.4.0.gem
+/deltacloud-core.init
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index 1df2182..9ddb80b 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -5,16 +5,14 @@
Summary: Deltacloud REST API
Name: deltacloud-core
Version: 0.4.0
-Release: 0.2.%{alphatag}
+Release: 0.3.%{alphatag}
Group: Development/Languages
License: ASL 2.0 and MIT
URL: http://incubator.apache.org/deltacloud
Source0: https://builds.apache.org/job/apache-deltacloud-core/%{buildnum}/artifact/deltacloud/trunk/server/pkg/%{name}-%{version}.gem
Source1: deltacloudd-fedora
-Source2: deltacloud-core
+Source2: deltacloud-core.init
Source3: deltacloud-core-config
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygems
Requires: ruby(abi) = 1.8
Requires: rubygem(haml)
@@ -59,17 +57,49 @@ Requires: %{name} = %{version}-%{release}
%description doc
Documentation for %{name}
+%package all
+Summary: Deltacloud Core with all drivers
+Requires: %{name} = %{version}-%{release}
+#Requires: %{name}-azure
+#Requires: %{name}-condor
+Requires: %{name}-ec2
+Requires: %{name}-eucalyptus
+Requires: %{name}-gogrid
+Requires: %{name}-opennebula
+Requires: %{name}-rackspace
+Requires: %{name}-rimuhosting
+Requires: %{name}-rhevm
+Requires: %{name}-sbc
+Requires: %{name}-terremark
+Requires: %{name}-vsphere
+
+%description all
+Deltacloud core with all available drivers
+
# FIXME: Azure requires waz-blobs gem which is not yet included in Fedora repos
#
-#%package azure
+#% 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}
@@ -79,15 +109,6 @@ Requires: rubygem(aws)
The ec2 sub-package brings in all dependencies necessary to use deltacloud
core to connect to EC2.
-%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.
-
%package eucalyptus
Summary: Deltacloud Core for Eucalyptus
Requires: %{name} = %{version}-%{release}
@@ -148,19 +169,6 @@ Requires: %{name} = %{version}-%{release}
The sbc sub-package brings in all dependencies necessary to use deltacloud core
to connect to SBC.
-%package all
-Summary: Deltacloud Core with all drivers
-Requires: %{name} = %{version}-%{release}
-Requires: deltacloud-core-ec2
-Requires: deltacloud-core-rackspace
-Requires: deltacloud-core-gogrid
-Requires: deltacloud-core-rimuhosting
-Requires: deltacloud-core-rhevm
-Requires: deltacloud-core-sbc
-
-%description all
-Deltacloud core with all available drivers
-
%package terremark
Summary: Deltacloud Core for Terremark
Requires: %{name} = %{version}-%{release}
@@ -171,13 +179,14 @@ Requires: rubygem(excon)
The terremark sub-package brings in all dependencies necessary to use deltacloud
core to connect to Terremark.
-%package condor
-Summary: Deltacloud Core for CondorCloud
+%package vsphere
+Summary: Deltacloud Core for vSphere
Requires: %{name} = %{version}-%{release}
+Requires: rubygem(rbvmomi)
-%description condor
-The condor sub-package brings in all dependencies necessary to use deltacloud core
-to connect to CondorCloud.
+%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
@@ -202,10 +211,28 @@ chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
chmod 0755 %{buildroot}%{_initddir}/%{name}
chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
rm -rf %{buildroot}%{app_root}/support
+
# Temporary 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
+
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
@@ -230,7 +257,6 @@ if [ "$1" -ge "1" ] ; then
fi
%files
-%defattr(-, root, root, -)
%{_initddir}/%{name}
%{_bindir}/deltacloudd
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
@@ -253,65 +279,65 @@ fi
%{app_root}/public/javascripts
%files doc
-%defattr(-, root, root, -)
%{_defaultdocdir}/%{name}
%{app_root}/tests
%{app_root}/%{name}.gemspec
%{app_root}/Rakefile
+%files all
+
#%files azure
-#%defattr(-, root, root, -)
+
+#%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
-%defattr(-, root, root, -)
%{app_root}/config/drivers/ec2.yaml
%files eucalyptus
-%defattr(-, root, root, -)
%{app_root}/config/drivers/eucalyptus.yaml
%files gogrid
-%defattr(-, root, root, -)
%{app_root}/config/drivers/gogrid.yaml
%files opennebula
-%defattr(-, root, root, -)
%{app_root}/config/drivers/opennebula.yaml
%files rackspace
-%defattr(-, root, root, -)
%{app_root}/config/drivers/rackspace.yaml
%files rhevm
-%defattr(-, root, root, -)
%{app_root}/config/drivers/rhevm.yaml
%files rimuhosting
-%defattr(-, root, root, -)
%{app_root}/config/drivers/rimuhosting.yaml
%files sbc
-%defattr(-, root, root, -)
%{app_root}/config/drivers/sbc.yaml
-%files vsphere
-%defattr(-, root, root, -)
-%{app_root}/config/drivers/vsphere.yaml
-
%files terremark
-%defattr(-, root, root, -)
%{app_root}/config/drivers/terremark.yaml
-%files condor
-%defattr(-, root, root, -)
-%{app_root}/config/drivers/condor.yaml
-%{app_root}/config/condor.yaml
-%{app_root}/config/addresses.xml
-
-%files all
-%defattr(-, root, root, -)
+%files vsphere
+%{app_root}/config/drivers/vsphere.yaml
%changelog
+* Wed Sep 14 2011 Chris Lalancette <clalance at redhat.com> - 0.4.0-0.3.rc1
+- Add patches to fix up deltacloud-core initscript
+- Clean up the specfile (sort subpackages in alphabetical order)
+- Disable deltacloud-core-condor subpackage for now (since it doesn't work)
+- Make sure the log directory is owned by nobody:nobody
+
* Wed Jul 17 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.0-0.2.rc1
- Removed mock subpackage since it's part of main deltacloud-core package
diff --git a/sources b/sources
index a354464..296c35e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
b14213ac9ea2a550db5e74c9d074c7c9 deltacloudd-fedora
-3e3f2510ca50962ac95c768600711e49 deltacloud-core
abeb7376c76aefa5090414740330124e deltacloud-core-config
d4b2524f86d006d95475866f5f944d0d deltacloud-core-0.4.0.gem
+3e3f2510ca50962ac95c768600711e49 deltacloud-core.init
More information about the scm-commits
mailing list