[deltacloud-core/f17] Update to Deltacloud API 1.0
Michal Fojtik
mfojtik at fedoraproject.org
Mon Jun 25 12:30:50 UTC 2012
commit 18ec3e29652995a943029b8f8506c7881ccfd0fb
Author: Michal <mi at mifo.sk>
Date: Mon Jun 25 14:21:04 2012 +0200
Update to Deltacloud API 1.0
.gitignore | 2 +
deltacloud-core.spec | 83 +++++++++++++++++++++++++++++++++++---------------
sources | 3 +-
3 files changed, 62 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e966ead..3674995 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
/0004-Fixed-validation-error.patch
/0005-Fixes-for-launcher.patch
/deltacloud-core-0.5.0.gem
+/deltacloud-core.service
+/deltacloud-core-1.0.0.gem
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index edde346..7897af2 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -2,15 +2,15 @@
Summary: Deltacloud REST API
Name: deltacloud-core
-Version: 0.5.0
-Release: 3%{?dist}.rc1
+Version: 1.0.0
+Release: 1%{?dist}
Group: Development/Languages
License: ASL 2.0 and MIT
-URL: http://incubator.apache.org/deltacloud
-Source0: http://people.apache.org/~lutter/deltacloud/0.5.0/rc1/%{name}-%{version}.gem
+URL: http://deltacloud.org
+Source0: http://www.apache.org/dist/deltacloud/%{version}/%{name}-%{version}.gem
Source1: deltacloudd-fedora
-Source2: deltacloud-core.init
-Source3: deltacloud-core-config
+Source2: deltacloud-core-config
+Source3: deltacloud-core.service
Requires: ruby(rubygems)
Requires: ruby(abi) = 1.9.1
Requires: rubygem(haml)
@@ -21,10 +21,12 @@ Requires: rubygem(net-ssh)
Requires: rubygem(json) >= 1.4.0
Requires: rubygem(rack-accept)
Requires: rubygem(nokogiri)
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(preun): initscripts
-Requires(postun): initscripts
+Requires: rubygem(sinatra-rabbit)
+Requires: rubygem(crack)
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+Requires(post): systemd-sysv
BuildRequires: rubygems-devel
BuildRequires: ruby(abi) = 1.9.1
BuildRequires: rubygem(haml)
@@ -40,6 +42,8 @@ BuildRequires: rubygem(rack-test)
BuildRequires: rubygem(json)
BuildRequires: rubygem(rspec-core)
BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(sinatra-rabbit)
+BuildRequires: rubygem(crack)
BuildArch: noarch
Obsoletes: rubygem-deltacloud-core
@@ -74,6 +78,7 @@ Requires: %{name}-sbc
Requires: %{name}-vsphere
Requires: %{name}-google
Requires: %{name}-openstack
+Requires: %{name}-fgcp
%description all
Deltacloud core with all available drivers
@@ -207,27 +212,41 @@ Requires: rubygem(rbvmomi)
The vsphere sub-package brings in all dependencies necessary to use deltacloud
core to connect to VMware vSphere.
+%package fgcp
+Summary: Deltacloud Core for Fujitsu Global Cloud Platform
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(xmlsimple)
+
+%description fgcp
+The fgcp sub-package brings in all dependencies necessary to use deltacloud
+core to connect to Fujitsu Global Cloud Platform (FGCP).
+
%prep
%setup -q -c -T
gem unpack -V --target=%{_builddir} %{SOURCE0}
pushd %{_builddir}/%{name}-%{version}
popd
+%triggerun -- deltacloud-core < 1.0-1
+/usr/bin/systemd-sysv-convert --save deltacloud-core >/dev/null 2>&1 ||:
+/bin/systemctl --no-reload enable deltacloud-core.service >/dev/null 2>&1 ||:
+/sbin/chkconfig --del deltacloud-core >/dev/null 2>&1 || :
+/bin/systemctl try-restart deltacloud-core.service >/dev/null 2>&1 || :
+
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{app_root}
-mkdir -p %{buildroot}%{_initddir}
+mkdir -p %{buildroot}%{_unitdir}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
cp -r %{_builddir}/%{name}-%{version}/* %{buildroot}%{app_root}
install -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/deltacloudd
-install -m 0755 %{SOURCE2} %{buildroot}%{_initddir}/%{name}
-install -m 0655 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -m 0655 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -m 0655 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
find %{buildroot}%{app_root}/lib -type f | xargs chmod -x
chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
-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
@@ -239,6 +258,9 @@ rm %{buildroot}%{app_root}/config/drivers/terremark.yaml
rdoc --op %{buildroot}%{_defaultdocdir}/%{name} &> /dev/null
+# Remove relic from vsphere patching
+rm -rf %{buildroot}%{app_root}/lib/deltacloud/drivers/ec2/ec2_driver.rb.orig
+
mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
# the condor stuff is provided by the condor-cloud package; it really doesn't
@@ -249,8 +271,6 @@ rm -rf %{buildroot}%{app_root}/support/fedora
%check
pushd %{buildroot}%{app_root}
-export API_USER='mockuser'
-export API_PASSWORD='mockpassword'
testrb tests/drivers/mock/*_test.rb
# TODO: This require VCR gem installed
@@ -258,27 +278,32 @@ testrb tests/drivers/mock/*_test.rb
# tests/drivers/openstack/api_test.rb tests/drivers/openstack/images_test.rb \
# tests/drivers/openstack/realms_test.rb tests/drivers/openstack/hardware_profiles_test.rb \
# tests/drivers/openstack/instances_test.rb
-popd
+#popd
%clean
%post
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add %{name}
+if [ $1 -eq 1 ] ; then
+ # Initial installation
+ /bin/systemctl enable deltacloud-core.service >/dev/null 2>&1 || :
+fi
%preun
if [ $1 -eq 0 ] ; then
- /sbin/service %{name} stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable deltacloud-core.service > /dev/null 2>&1 || :
+ /bin/systemctl stop deltacloud-core.service > /dev/null 2>&1 || :
fi
%postun
-if [ "$1" -ge "1" ] ; then
- /sbin/service %{name} condrestart >/dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart deltacloud-core.service >/dev/null 2>&1 || :
fi
%files
-%{_initddir}/%{name}
+%{_unitdir}/%{name}.service
%{_bindir}/deltacloudd
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%dir %{app_root}/
@@ -292,7 +317,6 @@ fi
%{app_root}/public/images
%{app_root}/public/stylesheets
%{app_root}/public/favicon.ico
-%doc %{app_root}/DISCLAIMER
%doc %{app_root}/NOTICE
%doc %{app_root}/LICENSE
# MIT
@@ -347,11 +371,20 @@ fi
%files vsphere
%{app_root}/config/drivers/vsphere.yaml
+%files fgcp
+%{app_root}/config/drivers/fgcp.yaml
+
%files google
%defattr(-, root, root, -)
%{app_root}/config/drivers/google.yaml
%changelog
+* Mon Jun 25 2012 Michal Fojtik <mfojtik at redhat.com> - 1.0.0-1
+- Update to 1.0.0 release
+
+* Wed Feb 08 2012 Michal Fojtik <mfojtik at redhat.com> - 0.5.0-1
+- Version bump 0.5.0 GA
+
* Mon Feb 06 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 0.5.0-3.rc1
- Rebuilt for Ruby 1.9.3.
diff --git a/sources b/sources
index c23b878..3c1892d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-c73aeec7e7606334428ddf96ba2ae5a9 deltacloud-core-0.5.0.gem
+bf4e5d4bf5785f4c4064de0866c84e4b deltacloud-core.service
+22061612516db70656eab771bde22216 deltacloud-core-1.0.0.gem
More information about the scm-commits
mailing list