diff --git a/0001-remove-win32-dep.patch b/0001-remove-win32-dep.patch deleted file mode 100644 index f9e4c05..0000000 --- a/0001-remove-win32-dep.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up ./vagrant-sshfs.gemspec.orig ./vagrant-sshfs.gemspec ---- ./vagrant-sshfs.gemspec.orig 2018-03-12 15:39:18.039461861 +0000 -+++ ./vagrant-sshfs.gemspec 2018-03-12 15:39:37.750061569 +0000 -@@ -22,14 +22,12 @@ - s.specification_version = 4 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then -- s.add_runtime_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) - s.add_development_dependency(%q.freeze, [">= 0"]) - else -- s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) -@@ -37,7 +35,6 @@ - s.add_dependency(%q.freeze, [">= 0"]) - end - else -- s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) - s.add_dependency(%q.freeze, [">= 0"]) diff --git a/vagrant-sshfs.spec b/vagrant-sshfs.spec index 934c6ab..2a43f9b 100644 --- a/vagrant-sshfs.spec +++ b/vagrant-sshfs.spec @@ -7,7 +7,7 @@ Release: 4%{?dist} Summary: A Vagrant synced folder plugin that mounts folders via SSHFS License: GPLv2 URL: https://github.com/dustymabe/vagrant-sshfs -Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem +Source0: https://github.com/dustymabe/vagrant-sshfs/archive/v%{version}.tar.gz Requires: vagrant >= 1.9.1 BuildRequires: vagrant >= 1.9.1 @@ -15,7 +15,6 @@ BuildRequires: rubygems BuildRequires: rubygem(rdoc) BuildArch: noarch Provides: vagrant(%{vagrant_plugin_name}) = %{version} -Patch1: 0001-remove-win32-dep.patch %description A Vagrant synced folder plugin that mounts folders via SSHFS. @@ -32,12 +31,13 @@ BuildArch: noarch Documentation for %{name}. %prep -gem unpack %{SOURCE0} +%setup -T -b 0 -q -n %{vagrant_plugin_name}-%{version} -%setup -q -D -T -n %{vagrant_plugin_name}-%{version} +# since we don't have the full git repo we can't use `git ls-files` +sed -i 's/git ls-files -z/find . -type f -print0/' %{vagrant_plugin_name}.gemspec -gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec -%patch1 +# remove dependencies on windows libraries (needed for windows, not linux) +sed -e '/win32-process/d' %{vagrant_plugin_name}.gemspec %build # Create the gem as gem install only works on a gem file @@ -76,6 +76,9 @@ cp -a .%{vagrant_plugin_dir}/* \ %{vagrant_plugin_instdir}/vagrant-sshfs.gemspec %changelog +* Tue December 10 2019 Dusty Mabe - 1.3.1-5 +- Change to build from tar archive. Preparing for packit. + * Sat Jul 27 2019 Fedora Release Engineering - 1.3.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild