commit 832be545960778fda424b1e8e64966384829e5fc
Author: Elan Ruusamäe <[email protected]>
Date: Wed Oct 30 00:17:47 2013 +0200
0.3.10
install-root.patch | 32 ++++++++------------------------
veewee.spec | 11 +++++++----
2 files changed, 15 insertions(+), 28 deletions(-)
---
diff --git a/veewee.spec b/veewee.spec
index 5304153..b61c856 100644
--- a/veewee.spec
+++ b/veewee.spec
@@ -3,12 +3,12 @@
# - grit
Summary: Build Vagrant base boxes or KVM, VirtualBox and Fusion images
Name: veewee
-Version: 0.3.7
-Release: 2
+Version: 0.3.10
+Release: 1
License: MIT
Group: Applications/Emulators
-Source0: https://github.com/jedi4ever/veewee/archive/v%{version}.tar.gz
-# Source0-md5: 2b5a2f293eabe65b9c104258574e5967
+Source0:
https://github.com/jedi4ever/veewee/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: eed8f95ccf7e23ba9ed6880b13b3862b
Patch0: install-root.patch
URL: http://github.com/jedi4ever/veewee/
BuildRequires: rpm-rubyprov
@@ -71,6 +71,9 @@ cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
cp -a templates validation $RPM_BUILD_ROOT%{_appdir}
+# junk
+rm -r $RPM_BUILD_ROOT%{ruby_vendorlibdir}/fission.old
+
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/install-root.patch b/install-root.patch
index c6f8e9b..cb7d935 100644
--- a/install-root.patch
+++ b/install-root.patch
@@ -1,17 +1,14 @@
---- veewee-0.3.7/lib/veewee/environment.rb 2013-01-10 12:02:14.000000000
+0200
-+++ veewee-0.3.7/lib/veewee/environment.rb 2013-05-06 10:44:52.445210226
+0300
-@@ -52,7 +52,7 @@
- attr_reader :ostypes
+--- veewee-0.3.10/lib/veewee/environment.rb~ 2013-10-29 23:47:12.000000000
+0200
++++ veewee-0.3.10/lib/veewee/environment.rb 2013-10-29 23:48:11.651946375
+0200
+@@ -63,13 +63,15 @@
+ # because several defaults are generated from it
+ cwd = options[:cwd] || Veewee::Environment.workdir
- def initialize(options = {})
--
+ install_dir = ENV['VEEWEE_INSTALL_DIR'] || '/usr/share/veewee'
- cwd = ENV['VEEWEE_DIR'] || Dir.pwd
- # If a cwd was provided as option it overrules the default
- cwd = options[:cwd] if options.has_key?(:cwd)
-@@ -62,9 +62,9 @@
++
+ defaults = {
+ :cwd => cwd,
:veewee_filename => "Veeweefile",
- :loglevel => :info,
:definition_dir => File.join(cwd, "definitions"),
- :template_path => [File.expand_path(File.join(File.dirname(__FILE__),
"..", "..", 'templates')), "templates"],
+ :template_path => [File.join(install_dir, 'templates'), "templates"],
@@ -21,16 +18,3 @@
:tmp_dir => File.join(cwd, "tmp")
}
---- veewee-0.3.7/lib/veewee/provider/core/box/validate_tags.rb 2013-01-10
12:02:14.000000000 +0200
-+++ veewee-0.3.7/lib/veewee/provider/core/box/validate_tags.rb 2013-05-06
14:06:41.000000000 +0300
-@@ -37,7 +37,9 @@
- featurefile="veewee.feature"
- end
-
--
feature_path=File.join(File.dirname(__FILE__),"..","..","..","..","..","validation",featurefile)
-+ #validation_dir =
File.dirname(__FILE__),"..","..","..","..","..","validation"
-+ validation_dir = '/usr/share/veewee/validation'
-+ feature_path=File.join(validation_dir, featurefile)
-
- features=Array.new
- features[0]=feature_path
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/veewee.git/commitdiff/634e069de7882e82da4f4bbd7f4a8926a11d3182
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
