incubator-deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Matt Wagner <matt.wag...@redhat.com>
Subject [PATCH] Change version to 0.3.0 and tweak RPM specs
Date Thu, 07 Apr 2011 23:08:31 GMT
---
 server/Rakefile                                    |    2 +-
 server/server.rb                                   |    2 +-
 server/support/fedora/deltacloud-core.spec         |    8 +++++---
 server/support/fedora/rubygem-deltacloud-core.spec |    8 +++++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/Rakefile b/server/Rakefile
index 8713941..6a5ed7a 100644
--- a/server/Rakefile
+++ b/server/Rakefile
@@ -76,7 +76,7 @@ task :install, [:install_dir, :bin_dir] do |t, args|
     Dir["views/**/**"],
     "config.ru",
     "COPYING",
-    "README",
+    "README.md",
     "*.rb"
   ]
 
diff --git a/server/server.rb b/server/server.rb
index 585f3e6..ab70dd1 100644
--- a/server/server.rb
+++ b/server/server.rb
@@ -32,7 +32,7 @@ require 'sinatra/rack_runtime'
 require 'sinatra/rack_etag'
 require 'sinatra/rack_matrix_params'
 
-set :version, '0.2.0'
+set :version, '0.3.0'
 
 include Deltacloud::Drivers
 set :drivers, Proc.new { driver_config }
diff --git a/server/support/fedora/deltacloud-core.spec b/server/support/fedora/deltacloud-core.spec
index 224afbb..602856d 100644
--- a/server/support/fedora/deltacloud-core.spec
+++ b/server/support/fedora/deltacloud-core.spec
@@ -4,8 +4,8 @@
 
 Summary: Deltacloud REST API
 Name: deltacloud-core
-Version: 0.2.0
-Release: 2%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
 URL: http://incubator.apache.org/deltacloud
@@ -66,6 +66,7 @@ mkdir -p %{buildroot}%{_initddir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/config
 mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
 mv %{buildroot}%{geminstdir}/support/fedora/deltacloud-core %{buildroot}%{_initddir}
 mv -f %{buildroot}%{geminstdir}/support/fedora/deltacloudd %{buildroot}%{geminstdir}/bin
@@ -76,7 +77,7 @@ chmod 755 %{buildroot}%{_initddir}/deltacloud-core
 
 %check
 pushd %{buildroot}%{geminstdir}
-rake test
+rake test:mock
 popd
 
 %clean
@@ -114,6 +115,7 @@ fi
 %{geminstdir}/public/favicon.ico
 %{gemdir}/cache/deltacloud-core-%{version}.gem
 %{gemdir}/specifications/deltacloud-core-%{version}.gemspec
+%{geminstdir}/config/drivers.yaml
 # MIT
 %{gemdir}/gems/deltacloud-core-%{version}/public/javascripts
 
diff --git a/server/support/fedora/rubygem-deltacloud-core.spec b/server/support/fedora/rubygem-deltacloud-core.spec
index 8d48acb..e9bde61 100644
--- a/server/support/fedora/rubygem-deltacloud-core.spec
+++ b/server/support/fedora/rubygem-deltacloud-core.spec
@@ -5,7 +5,7 @@
 
 Summary: Deltacloud REST API
 Name: rubygem-%{gemname}
-Version: 0.2.0
+Version: 0.3.0
 Release: 1%{?dist}
 Group: Development/Languages
 License: ASL 2.0 and MIT
@@ -57,6 +57,7 @@ mkdir -p %{buildroot}%{_initddir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/config
 mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
 mv %{buildroot}%{geminstdir}/support/fedora/%{gemname} %{buildroot}%{_initddir}
 mv -f %{buildroot}%{geminstdir}/support/fedora/deltacloudd %{buildroot}%{geminstdir}/bin
@@ -66,8 +67,8 @@ find %{buildroot}%{geminstdir}/lib -type f | xargs chmod -x
 chmod 755 %{buildroot}%{_initddir}/%{gemname}
 
 %check
-pushd ./%{geminstdir}
-rake test
+pushd %{geminstdir}
+rake test:mock
 popd
 
 %clean
@@ -105,6 +106,7 @@ fi
 %{geminstdir}/public/favicon.ico
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{geminstdir}/config/drivers.yaml
 # MIT
 %{gemdir}/gems/%{gemname}-%{version}/public/javascripts
 
-- 
1.7.4.2


Mime
View raw message