[packages/vagrant] drop obsolete source_root.patch
glen
glen at pld-linux.org
Wed Aug 19 16:25:45 CEST 2015
commit d291d61b8ac1cbdb169fecbe60896b8420ca52c2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Aug 19 17:07:01 2015 +0300
drop obsolete source_root.patch
source_root.patch | 21 ---------------------
vagrant.spec | 2 --
2 files changed, 23 deletions(-)
---
diff --git a/vagrant.spec b/vagrant.spec
index df811f8..fbaa21b 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -9,7 +9,6 @@ Group: Applications/Emulators
Source0: https://github.com/mitchellh/vagrant/archive/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 556b5e5594a327d46b63c4d8024db187
Source1: %{name}.sh
-Patch0: source_root.patch
Patch1: rubygems.patch
Patch2: no-warning.patch
Patch3: Vagrantfile.patch
@@ -118,7 +117,6 @@ Ruby documentation for %{gem_name}
%prep
%setup -q
-#%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
diff --git a/source_root.patch b/source_root.patch
deleted file mode 100644
index 70f9ee2..0000000
--- a/source_root.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- vagrant-1.5.0/lib/vagrant/shared_helpers.rb~ 2014-03-10 07:50:03.000000000 +0200
-+++ vagrant-1.5.0/lib/vagrant/shared_helpers.rb 2014-03-13 07:15:33.997139002 +0200
-@@ -45,6 +45,7 @@
- #
- # @return [Pathname]
- def self.source_root
-+ @source_root ||= Pathname.new('/usr/share/vagrant')
- @source_root ||= Pathname.new(File.expand_path('../../../', __FILE__))
- end
-
---- ./bin/vagrant~ 2014-03-13 07:24:35.000000000 +0200
-+++ ./bin/vagrant 2014-03-13 09:48:05.406002464 +0200
-@@ -42,7 +42,7 @@
- ruby_path = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
- Kernel.exec(
- ruby_path,
-- File.expand_path("../../lib/vagrant/pre-rubygems.rb", __FILE__),
-+ File.expand_path("/usr/share/gems/gems/vagrant-1.7.1/lib/vagrant/pre-rubygems.rb", __FILE__),
- *ARGV)
- raise "Fatal error: this line should never be reached"
- end
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vagrant.git/commitdiff/3353e2a3bdd04afe0bde2a80870d466a3044391b
More information about the pld-cvs-commit
mailing list