[deltacloud-core] Version bump 0.5.0
Michal Fojtik
mfojtik at fedoraproject.org
Wed Jan 11 13:29:27 UTC 2012
commit 817ed4b622d7464dd0a046461fd0c972735d0e26
Author: Michal Fojtik <mi at mifo.sk>
Date: Wed Jan 11 14:29:05 2012 +0100
Version bump 0.5.0
.gitignore | 1 +
deltacloud-core.init | 2 +-
deltacloud-core.spec | 81 +++++++++++++++++++++++---------------------------
sources | 10 +-----
4 files changed, 41 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a37cd46..e966ead 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/0003-Openstack-driver.patch
/0004-Fixed-validation-error.patch
/0005-Fixes-for-launcher.patch
+/deltacloud-core-0.5.0.gem
diff --git a/deltacloud-core.init b/deltacloud-core.init
index 916cb7b..11df83e 100644
--- a/deltacloud-core.init
+++ b/deltacloud-core.init
@@ -58,7 +58,7 @@ start() {
stop() {
echo -n $"Shutting down $prog: "
if [ -f $PIDFILE ]; then
- kill -3 `cat $PIDFILE`
+ kill -9 `cat $PIDFILE`
retval=$?
if [ $retval -eq 0 ] && rm -f $LOCKFILE $PIDFILE; then
echo_success
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index 45307e1..1a0c59f 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -2,21 +2,15 @@
Summary: Deltacloud REST API
Name: deltacloud-core
-Version: 0.4.1
-Release: 7%{?dist}
+Version: 0.5.0
+Release: 1%{?dist}.rc1
Group: Development/Languages
License: ASL 2.0 and MIT
URL: http://incubator.apache.org/deltacloud
-Source0: http://gems.rubyforge.org/gems/%{name}-%{version}.gem
+Source0: http://people.apache.org/~lutter/deltacloud/0.5.0/rc1/%{name}-%{version}.gem
Source1: deltacloudd-fedora
Source2: deltacloud-core.init
Source3: deltacloud-core-config
-Patch1: 0002-Google-storage-driver.patch
-Patch2: 0001-Backported-r1181859-patches.patch
-Patch3: 0001-Vsphere-Removed-unnecessary-validation-in-create_ins.patch
-Patch4: 0003-Openstack-driver.patch
-Patch5: 0004-Fixed-validation-error.patch
-Patch6: 0005-Fixes-for-launcher.patch
Requires: rubygems
Requires: ruby(abi) = 1.8
Requires: rubygem(haml)
@@ -64,7 +58,7 @@ Documentation for %{name}
Summary: Deltacloud Core with all drivers
Requires: %{name} = %{version}-%{release}
#Requires: %{name}-azure
-Requires: %{name}-condor
+#Requires: %{name}-condor
Requires: %{name}-ec2
Requires: %{name}-eucalyptus
Requires: %{name}-gogrid
@@ -73,7 +67,7 @@ Requires: %{name}-rackspace
Requires: %{name}-rimuhosting
Requires: %{name}-rhevm
Requires: %{name}-sbc
-Requires: %{name}-terremark
+#Requires: %{name}-terremark
Requires: %{name}-vsphere
Requires: %{name}-google
Requires: %{name}-openstack
@@ -101,17 +95,17 @@ Requires: rubygem(fog)
The google sub-package brings in all dependencies necessary to use deltacloud
core to connect to Google Storage.
-%package condor
-Summary: Deltacloud Core for CondorCloud
-Requires: %{name} = %{version}-%{release}
-Requires: rubygem(uuidtools)
-Requires: rubygem(rest-client)
-Requires: condor >= 7.4.0
-Requires: condor-vm-gahp >= 7.4.0
+#%package condor
+#Summary: Deltacloud Core for CondorCloud
+#Requires: %{name} = %{version}-%{release}
+#Requires: rubygem(uuidtools)
+#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.
+#%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
@@ -191,15 +185,15 @@ Requires: %{name} = %{version}-%{release}
The sbc sub-package brings in all dependencies necessary to use deltacloud core
to connect to SBC.
-%package terremark
-Summary: Deltacloud Core for Terremark
-Requires: %{name} = %{version}-%{release}
-Requires: rubygem(fog)
-Requires: rubygem(excon)
+#%package terremark
+#Summary: Deltacloud Core for Terremark
+#Requires: %{name} = %{version}-%{release}
+#Requires: rubygem(fog)
+#Requires: rubygem(excon)
-%description terremark
-The terremark sub-package brings in all dependencies necessary to use deltacloud
-core to connect to 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
@@ -214,12 +208,6 @@ core to connect to VMware vSphere.
%setup -q -c -T
gem unpack -V --target=%{_builddir} %{SOURCE0}
pushd %{_builddir}/%{name}-%{version}
-%patch1 -p2
-%patch2 -p2
-%patch3 -p2
-%patch4 -p2
-%patch5 -p2
-%patch6 -p2
popd
%build
@@ -240,7 +228,11 @@ chmod 0755 %{buildroot}%{_initddir}/%{name}
chmod 0755 %{buildroot}%{app_root}/bin/deltacloudd
# Temporary remove Azure drivers until all dependencies will be pushed in to Fedora
-rm -rf %{buildroot}%{app_root}/config/drivers/azure.yaml
+rm %{buildroot}%{app_root}/config/drivers/azure.yaml
+rm %{buildroot}%{app_root}/config/drivers/condor.yaml
+rm %{buildroot}%{app_root}/config/condor.yaml
+rm %{buildroot}%{app_root}/config/addresses.xml
+rm %{buildroot}%{app_root}/config/drivers/terremark.yaml
rdoc --op %{buildroot}%{_defaultdocdir}/%{name} &> /dev/null
@@ -250,7 +242,6 @@ mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
# belong in deltacloud, but until it is removed from upstream we just manually
# delete it here
rm -rf %{buildroot}%{app_root}/support/condor
-
rm -rf %{buildroot}%{app_root}/support/fedora
%check
@@ -288,7 +279,6 @@ fi
%dir %{app_root}/
%{app_root}/bin
%{app_root}/config.ru
-%{app_root}/*.rb
%{app_root}/views
%{app_root}/lib
%dir %{app_root}/config/drivers
@@ -314,10 +304,10 @@ fi
#%files azure
-%files condor
-%{app_root}/config/drivers/condor.yaml
-%{app_root}/config/condor.yaml
-%{app_root}/config/addresses.xml
+#%files condor
+#%{app_root}/config/drivers/condor.yaml
+#%{app_root}/config/condor.yaml
+#%{app_root}/config/addresses.xml
%files ec2
%{app_root}/config/drivers/ec2.yaml
@@ -346,8 +336,8 @@ fi
%files sbc
%{app_root}/config/drivers/sbc.yaml
-%files terremark
-%{app_root}/config/drivers/terremark.yaml
+#%files terremark
+#%{app_root}/config/drivers/terremark.yaml
%files vsphere
%{app_root}/config/drivers/vsphere.yaml
@@ -357,6 +347,9 @@ fi
%{app_root}/config/drivers/google.yaml
%changelog
+* Thu Dec 15 2011 Michal Fojtik <mfojtik at redhat.com> - 0.5.0-1.rc1
+- Updated to 0.5.1
+
* Thu Dec 15 2011 Michal Fojtik <mfojtik at redhat.com> - 0.4.1-7
- Removed rspec build dependency
diff --git a/sources b/sources
index 8061a07..257710d 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,4 @@
-83a4110796feece905c1911d8b7472d7 deltacloud-core-0.4.1.gem
-c29d9bd8b82d4c8f1c5ac7c69b3e9b22 0001-Backported-r1181859-patches.patch
-5a110ceb808d751cf9ce8fd5497847bb 0002-Google-storage-driver.patch
-360b8ee6e41b4357fe1b2dfa72efa1c0 0001-Vsphere-Removed-unnecessary-validation-in-create_ins.patch
-2f97b62591116a380b319f5beb80f9d9 0003-Openstack-driver.patch
-0b8351b632963e0818f74cfdaad02e20 0004-Fixed-validation-error.patch
-0ce45b479ad4ccf4eb4d2f71a742488d deltacloud-core.init
-fa7ff3ee412817b153abdf8d8d28b6a1 0005-Fixes-for-launcher.patch
b14213ac9ea2a550db5e74c9d074c7c9 deltacloudd-fedora
04d69921005cfe605aafd081d0768dae deltacloud-core-config
+c73aeec7e7606334428ddf96ba2ae5a9 deltacloud-core-0.5.0.gem
+e44159c0563fdddc0b33db4fc4b4fbf3 deltacloud-core.init
More information about the scm-commits
mailing list