[deltacloud-core/el6] Updated specfile

Michal Fojtik mfojtik at fedoraproject.org
Fri Jul 15 13:45:46 UTC 2011 

commit 8185e86d5d20787e89158560c24b22defabd45b6
Author: Michal Fojtik <mi at mifo.sk>
Date:   Fri Jul 15 15:45:21 2011 +0200

    Updated specfile

 .gitignore           |    4 +
 deltacloud-core.spec |  164 ++++++++++++++++++++++++++++++++++++++++++++++++--
 sources              |    6 ++-
 3 files changed, 168 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dee1b6e..763ff5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 /deltacloud-core
 /deltacloud-core-config
 /deltacloud-core.spec
+/fix_load_balancers.patch
+/rhevm-long-username-fix.patch
+/fix_rhevm_memory_calculation.patch
+/deltacloudd-fedora
diff --git a/deltacloud-core.spec b/deltacloud-core.spec
index e0de0e5..e789836 100644
--- a/deltacloud-core.spec
+++ b/deltacloud-core.spec
@@ -3,7 +3,7 @@
 Summary: Deltacloud REST API
 Name: deltacloud-core
 Version: 0.3.0
-Release: 7%{?dist}
+Release: 11%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
 URL: http://incubator.apache.org/deltacloud
@@ -13,6 +13,8 @@ Source2: deltacloud-core
 Source3: deltacloud-core-config
 Patch0: fix_load_balancers.patch
 Patch1: fix_rhevm_memory_calculation.patch
+Patch2: rhevm-long-username-fix.patch
+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
@@ -53,22 +55,129 @@ which implements the REST interface.
 %package doc
 Summary: Documentation for %{name}
 Group: Documentation
-Requires:%{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description doc
 Documentation for %{name}
 
+# 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
+#The azure sub-package brings in all dependencies necessary to use deltacloud
+#core to connect to Azure.
+
+%package ec2
+Summary: Deltacloud Core for EC2
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(aws)
+
+%description ec2
+The ec2 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}
+
+%description gogrid
+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}
+
+%description opennebula
+The opennebula sub-package brings in all dependencies necessary to use
+deltacloud core to connect to OpenNebula.
+
+%package rackspace
+Summary: Deltacloud Core for Rackspace
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(cloudfiles)
+Requires: rubygem(cloudservers)
+
+%description rackspace
+The rackspace sub-package brings in all dependencies necessary to use deltacloud
+core to connect to Rackspace.
+
+%package rhevm
+Summary: Deltacloud Core for RHEV-M
+Requires: %{name} = %{version}-%{release}
+Requires: rubygem(rest-client)
+
+%description rhevm
+The rhevm sub-package brings in all dependencies necessary to use deltacloud
+core to connect to RHEV-M.
+
+%package rimuhosting
+Summary: Deltacloud Core for Rimuhosting
+Requires: %{name} = %{version}-%{release}
+
+%description rimuhosting
+The rimuhosting sub-package brings in all dependencies necessary to use
+deltacloud core to connect to Rimuhosting.
+
+%package sbc
+Summary: Deltacloud Core for SBC
+Requires: %{name} = %{version}-%{release}
+
+%description sbc
+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
+Requires: deltacloud-core-mock
+
+%description all
+Deltacloud core with all available drivers
+
+# FIXME: Terremark requires gems not included in Fedora repos yet.
+#
+#%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.
+
 %prep
-%setup -q -c -T 
+%setup -q -c -T
 gem unpack -V --target=%{_builddir} %{SOURCE0}
 pushd %{_builddir}/%{name}-%{version}
 %patch0
 %patch1
+%patch2
 popd
 
 %build
 
 %install
+rm -rf %{buildroot}
 mkdir -p %{buildroot}%{app_root}
 mkdir -p %{buildroot}%{_initddir}
 mkdir -p %{buildroot}%{_bindir}
@@ -77,8 +186,8 @@ 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}
-chmod -x %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 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
 rm -rf %{buildroot}%{app_root}/support
@@ -109,8 +218,8 @@ fi
 %files
 %defattr(-, root, root, -)
 %{_initddir}/%{name}
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_bindir}/deltacloudd
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %dir %{app_root}/
 %{app_root}/bin
 %{app_root}/config.ru
@@ -135,7 +244,52 @@ fi
 %{app_root}/%{name}.gemspec
 %{app_root}/Rakefile
 
+#%files azure
+#%defattr(-, root, root, -)
+
+%files ec2
+%defattr(-, root, root, -)
+
+%files gogrid
+%defattr(-, root, root, -)
+
+%files mock
+%defattr(-, root, root, -)
+
+%files opennebula
+%defattr(-, root, root, -)
+
+%files rackspace
+%defattr(-, root, root, -)
+
+%files rhevm
+%defattr(-, root, root, -)
+
+%files rimuhosting
+%defattr(-, root, root, -)
+
+%files sbc
+%defattr(-, root, root, -)
+
+%files all
+%defattr(-, root, root, -)
+
+#%files terremark
+#%defattr(-, root, root, -)
+
 %changelog
+* Mon Jul 11 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-11
+- Added virtual package with all drivers
+
+* Fri Jun 7 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-10
+- Added patch to handle long usernames
+
+* Fri Jun 3 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-9
+- Removed Azure and Terremark driver because of unsatisfied dependencies
+
+* Tue May 31 2011 Chris Lalancette <clalance at redhat.com> - 0.3.0-8
+- Create sub-packages to bring in dependencies
+
 * Tue May 31 2011 Michal Fojtik <mfojtik at redhat.com> - 0.3.0-7
 - Added default config file in /etc/sysconfig/deltacloud-core
 
diff --git a/sources b/sources
index 263d6ae..ce96f4d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,7 @@
 a17d75cc0636bd868504c5415b337752  deltacloud-core
-ffc61394986f6db4259cecba0b66e084  deltacloud-core-config
 cd91d943da0b5b1841e6e566e216b5c9  deltacloud-core.spec
+4c4a9c31696763e9049f645282c5d672  fix_load_balancers.patch
+ea1decfcee3c01bd7154b5187f661017  rhevm-long-username-fix.patch
+a9ef9312ad161310d9d069bb9dbb8d5c  fix_rhevm_memory_calculation.patch
+b14213ac9ea2a550db5e74c9d074c7c9  deltacloudd-fedora
+abeb7376c76aefa5090414740330124e  deltacloud-core-config

More information about the scm-commits mailing list