[packages/veewee] use system vnc, and it's optional
glen
glen at pld-linux.org
Mon May 13 15:56:22 CEST 2013
commit 62f2d142db1efa76c98f4052bc2d8c2d88ea5392
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Mon May 13 16:44:37 2013 +0300
use system vnc, and it's optional
veewee.spec | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/veewee.spec b/veewee.spec
index d6892e6..2f18d04 100644
--- a/veewee.spec
+++ b/veewee.spec
@@ -26,13 +26,15 @@ Requires: ruby-popen4 >= 0.1.2
Requires: ruby-progressbar
Requires: ruby-thor < 1
Requires: ruby-thor >= 0.15
-Requires: ruby-vnc < 1.1
-Requires: ruby-vnc >= 1.0.0
Requires: vagrant >= 0.9
+# vnc: for vmware fusion and kvm
+# fog: for libvirt (kvm)
Suggests: ruby-cucumber >= 1.0.0
Suggests: ruby-fission = 0.4.0
Suggests: ruby-fog >= 1.8
+Suggests: ruby-vnc >= 1.0.1-1
Conflicts: ruby-fog >= 2
+Conflicts: ruby-vnc > 1.2
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,6 +59,11 @@ Besides building Vagrant boxes, veewee can also be used for:
%patch0 -p1
%{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
+# unvendor
+# https://github.com/jedi4ever/veewee/commit/9f1163b53aa3ee82b0776c52bef92b74f6bd2cdb
+rm lib/net/vnc/vnc.rb
+%{__sed} -i -e 's,net/vnc/vnc.rb,net/vnc.rb,' lib/veewee/provider/core/box/vnc.rb
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{_bindir},%{_appdir}}
@@ -84,8 +91,6 @@ rm -rf $RPM_BUILD_ROOT
%{ruby_vendorlibdir}/java/dir2floppy.jar
%{ruby_vendorlibdir}/java/dir2floppy.java
-%{ruby_vendorlibdir}/net/vnc/vnc.rb
-
%dir %{ruby_vendorlibdir}/python
%{ruby_vendorlibdir}/python/parallels_sdk_check.py
%{ruby_vendorlibdir}/python/parallels_send_key.py
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/veewee.git/commitdiff/62f2d142db1efa76c98f4052bc2d8c2d88ea5392
More information about the pld-cvs-commit
mailing list