---
Rakefile | 6 ++--
deltacloud_recipe.spec | 65 +++++++++++++++++-------------------------------
2 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/Rakefile b/Rakefile
index 177c9bc..a63d18a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,15 +10,15 @@ YUM_REPO = "#{CURRENT_DIR}/repo"
CLEAN.include('pkg', 'build', 'repo', 'deltacloud_appliance.ks.new')
CLOBBER.include('deltacloud')
-PKG_NAME = "deltacloud_appliance"
-RPM_SPEC = "deltacloud_appliance.spec"
+PKG_NAME = "deltacloud_recipe"
+RPM_SPEC = "deltacloud_recipe.spec"
task :default => :"image:create"
# Build the rpm
Rake::RpmTask.new(RPM_SPEC) do |rpm|
rpm.need_tar = true
- rpm.package_files.include("#{PKG_NAME}/**/*")
+ rpm.package_files.include("bin/*", "#{PKG_NAME}/**/*")
rpm.topdir = "#{RPMBUILD_DIR}"
end
diff --git a/deltacloud_recipe.spec b/deltacloud_recipe.spec
index 77330c2..365d802 100644
--- a/deltacloud_recipe.spec
+++ b/deltacloud_recipe.spec
@@ -1,10 +1,10 @@
-%define aceHome /usr/share/ace
+%define dchome /usr/share/deltacloud-recipe
%define pbuild %{_builddir}/%{name}-%{version}
-Summary: DeltaCloud Appliance
-Name: deltacloud_appliance
-Version: 0.0.2
-Release: 3%{?dist}
+Summary: DeltaCloud Puppet Recipe
+Name: deltacloud_recipe
+Version: 0.0.3
+Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2+
@@ -12,47 +12,20 @@ URL: http://deltacloud.org
Source0: %{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}
BuildArch: noarch
-Requires: ace-banners
-Requires: ace-ssh
-Requires: ace-postgres
-
-# Deltacloud and dependencies
-Requires: deltacloud-aggregator
-Requires: deltacloud-aggregator-daemons
-Requires: deltacloud-aggregator-doc
-Requires: condor >= 7.5.0
Requires: ruby
-Requires: ruby-rdoc
-Requires: ruby-devel
-Requires: rubygem-rails
-Requires: gcc-c++
-Requires: libxml2-devel
-Requires: libxslt-devel
-Requires: libcurl-devel
-Requires: pulp
-Requires: pulp-client
-
-Requires: rubygem-thin
-Requires: rubygem-haml
-# To download the image builder and warehouse,
-# eventually replace with the corresponding rpms
-Requires: wget
+# We only leverage the firewall module from this,
+# not worth the overhead of pulling this in, so
+# we should implmenet our own
+Requires: ace
# To send a request to iwhd rest interface to
# create buckets, eventually replace w/ an
# iwhd client
Requires: curl
-# Image warehouse deps, remove when we pull in rpm
-Requires: jansson
-Requires: libmicrohttpd
-Requires: hail
-Requires: tokyocabinet
-Requires: mongo
-
%description
-Deltacloud appliance
+Deltacloud Puppet Recipe
%prep
%setup -q
@@ -61,19 +34,27 @@ Deltacloud appliance
%install
rm -rf %{buildroot}
-%{__mkdir} -p %{buildroot}/%{aceHome}/appliances/%{name}
-%{__cp} -R %{pbuild}/%{name}/* %{buildroot}/%{aceHome}/appliances/%{name}
+%{__mkdir} -p %{buildroot}/%{dchome}/modules/%{name} %{buildroot}/%{_sbindir}
+%{__cp} -R %{pbuild}/%{name}/deltacloud_recipe.pp %{buildroot}/%{dchome}
+%{__cp} -R %{pbuild}/%{name}/deltacloud_uninstall.pp %{buildroot}/%{dchome}
+%{__cp} -R %{pbuild}/%{name}/*/ %{buildroot}/%{dchome}/modules/%{name}
+%{__cp} -R %{pbuild}/bin/dc-install %{buildroot}/%{_sbindir}/
+%{__cp} -R %{pbuild}/bin/dc-uninstall %{buildroot}/%{_sbindir}/
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%dir %{aceHome}
-%{aceHome}/*
-
+%attr(0755, root, root) %{_sbindir}/dc-install
+%attr(0755, root, root) %{_sbindir}/dc-uninstall
+%{dchome}
%changelog
+* Wed Sep 29 2010 Mohammed Morsi <[email protected]> 0.0.3-1
+- Renamed package from deltacloud appliance
+- to deltacloud recipe
+
* Wed Sep 29 2010 Mohammed Morsi <[email protected]> 0.0.2-3
- Include curl-devel for typhoeus gem
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
