diff --git a/.gitignore b/.gitignore index 58dae8b..9fb52f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -/vagrant-sshfs-*.gem -README.packit +/vagrant-sshfs-1.1.0.gem +/vagrant-sshfs-1.2.0.gem +/vagrant-sshfs-1.2.1.gem +/vagrant-sshfs-1.3.0.gem +/vagrant-sshfs-1.3.1.gem diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index b092074..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,42 +0,0 @@ -upstream_project_url: https://github.com/dustymabe/vagrant-sshfs.git - -# We're not using source-git for now -##### The upstream_ref is the last upstream commit. All commits in the -##### current branch after that commit are "patches" that will be added -##### in the RPM spec file. -####upstream_ref: v1.3.1 - -upstream_package_name: vagrant-sshfs -downstream_package_name: vagrant-sshfs - -# Don't push to dist-git directly, create PR -create_pr: true - -# our tags in git are v1.0.0 and our rpm versions are 1.0.0 -upstream_tag_template: v{version} - -# The following allows us to not store our spec file in the upstream repo -actions: - post-upstream-clone: "curl -LO https://src.fedoraproject.org/rpms/vagrant-sshfs/raw/main/f/vagrant-sshfs.spec" - -# We are downloading (curl) to ./vagrant-sshfs.spec -specfile_path: vagrant-sshfs.spec - -# Jobs specifications - interpreted by packit service -####jobs: -####- job: sync_from_downstream -#### trigger: commit -####- job: propose_downstream -#### trigger: commit -#### metadata: -#### dist-git-branch: master -####- job: propose_downstream -#### trigger: release -#### metadata: -#### dist-git-branch: f31 -####- job: copr_build -#### trigger: pull_request -#### metadata: -#### targets: -#### - fedora-31-x86_64 - diff --git a/0001-remove-win32-dep.patch b/0001-remove-win32-dep.patch new file mode 100644 index 0000000..f9e4c05 --- /dev/null +++ b/0001-remove-win32-dep.patch @@ -0,0 +1,26 @@ +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/README.md b/README.md deleted file mode 100644 index 8ad78b6..0000000 --- a/README.md +++ /dev/null @@ -1,46 +0,0 @@ -This repo can be controlled with packit. - -You'll need a packit.yaml file created. - -``` -$ cat < ~/.config/packit.yaml -debug: false -authentication: -# github.com: -# token: XXX - pagure: - token: XXX - instance_url: "https://src.fedoraproject.org" -EOF -``` - -The tokens come from: - -- https://src.fedoraproject.org/settings#nav-api-tab -- https://github.com/settings/tokens (not needed for this) - -Packit uses the `rawhide` branch. Make sure the `rawhide` branch -in the local repo is up to date with latest upstream master. This -can be tricky depending on if `master` tracks your fork or the -upstream repo. - -Then from this repo you can open a PR with: - -``` -$ packit propose-downstream --dist-git-branch rawhide -``` - -If that is not picking up the latest version for some reason you can -specify the latest version with a syntax like: - -``` -$ packit propose-downstream --dist-git-branch rawhide https://github.com/dustymabe/vagrant-sshfs.git 1.3.7 -``` - -You can kick off a build with: - -``` -$ packit build -``` - -Then sync to other branches and `fedpkg build` those too. diff --git a/sources b/sources index f807e05..4d5832d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vagrant-sshfs-1.3.7.gem) = 3a00062037ee03284a3d19b60623eb33da715fcca61f21dbe7269254878ea068f7ea56c94c5c27773a6fe61031d9af896e1abed1067187c118643be00719df27 +SHA512 (vagrant-sshfs-1.3.1.gem) = a0d380df489ac7c33ea7b66e754d792aceaba7bf0ba206650da68febb4a75823c8dcfc1f59c29557fe435fd5afe43cf399d426c62f2719fe27884742487f1c78 diff --git a/vagrant-sshfs.spec b/vagrant-sshfs.spec index fa105d3..1aceb93 100644 --- a/vagrant-sshfs.spec +++ b/vagrant-sshfs.spec @@ -2,23 +2,21 @@ %global vagrant_plugin_name vagrant-sshfs Name: %{vagrant_plugin_name} -Version: 1.3.7 -Release: 14%{?dist} +Version: 1.3.1 +Release: 2%{?dist} Summary: A Vagrant synced folder plugin that mounts folders via SSHFS -# Automatically converted from old format: GPLv2 - review is highly recommended. -License: GPL-2.0-only +Group: Development/Languages +License: GPLv2 URL: https://github.com/dustymabe/vagrant-sshfs Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem Requires: vagrant >= 1.9.1 -Recommends: /usr/bin/fusermount -Recommends: /usr/bin/sshfs -BuildRequires: ruby(release) BuildRequires: vagrant >= 1.9.1 -BuildRequires: rubygems-devel +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. @@ -28,6 +26,7 @@ https://github.com/fabiokr/vagrant-sshfs. %package doc Summary: Documentation for %{name} +Group: Documentation Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -35,13 +34,19 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -b 0 -q -n %{vagrant_plugin_name}-%{version} +gem unpack %{SOURCE0} -# remove dependencies on windows libraries (needed for windows, not linux) -%gemspec_remove_dep -s ../%{vagrant_plugin_name}-%{version}.gemspec -g win32-process +%setup -q -D -T -n %{vagrant_plugin_name}-%{version} + +gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec +%patch1 %build -gem build ../%{vagrant_plugin_name}-%{version}.gemspec +# Create the gem as gem install only works on a gem file +gem build %{vagrant_plugin_name}.gemspec + +# %%vagrant_plugin_install compiles any C extensions and installs the gem into ./%%gem_dir +# by default, so that we can move it into the buildroot in %%install %vagrant_plugin_install %install @@ -49,6 +54,8 @@ mkdir -p %{buildroot}%{vagrant_plugin_dir} cp -a .%{vagrant_plugin_dir}/* \ %{buildroot}%{vagrant_plugin_dir}/ + + %files %dir %{vagrant_plugin_instdir} %license %{vagrant_plugin_instdir}/LICENSE @@ -60,7 +67,6 @@ cp -a .%{vagrant_plugin_dir}/* \ %exclude %{vagrant_plugin_instdir}/.gitignore %exclude %{vagrant_plugin_instdir}/test %exclude %{vagrant_plugin_instdir}/features -%exclude %{vagrant_plugin_instdir}/build.sh %files doc %license %{vagrant_plugin_instdir}/LICENSE @@ -72,98 +78,6 @@ cp -a .%{vagrant_plugin_dir}/* \ %{vagrant_plugin_instdir}/vagrant-sshfs.gemspec %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.3.7-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.3.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.3.7-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.3.7-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jul 29 2024 Miroslav Suchý - 1.3.7-10 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.3.7-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.3.7-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.3.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.3.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.3.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 21 2022 Dusty Mabe - 1.3.7-4 -- version: bump to 1.3.7 (Dusty Mabe) -- Gemfile: bump to latest versions of vagrant and vagrant-libvirt (Dusty Mabe) -- sshfs_reverse_mount: use ruby Etc lib for owner/group (Dusty Mabe) -- sshfs_reverse_mount: create guest directory if not exists (Dusty Mabe) -- sshfs_reverse_mount: fixup botched copy/paste (Dusty Mabe) -- guest: upload fuse module loading for FreeBSD (Dusty Mabe) -- Update to Fedora 36 for build container and test VM (Dusty Mabe) -- tests: switch config.ssh.insert_key to boolean in Vagrantfile (Dusty Mabe) -- add support for owner, group, and mount_options (Dusty Mabe) -- guest: handle Alma/Rocky until fixes land upstream (Dusty Mabe) -- guest: add Alma Linux support (Dusty Mabe) -- guest: Enterprise Linux 9 has landed (Dusty Mabe) -- Remove superfluous case/when (only rocky_8 exists) (Even Onsager) -- Add Rocky guest_capability to plugin.rb (Even Onsager) -- Add guest capabilities file for Rocky (based on CentOS) (Even Onsager) - -* Mon Jun 13 2022 Dan Čermák - 1.3.6-4 -- Add recommends for fusermount and sshfs for reverse mounting - -* Sat Jan 22 2022 Fedora Release Engineering - 1.3.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.3.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 03 2021 Dusty Mabe - 1.3.6-1 -- new upstream release: 1.3.6 - -* Mon May 03 2021 Dusty Mabe - 1.3.5-4 -- specfile updates from Pavel Valena - -* Wed Jan 27 2021 Fedora Release Engineering - 1.3.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 29 2020 Dusty Mabe - 1.3.5-1 -- new upstream release: 1.3.5 - -* Mon Mar 16 2020 Dusty Mabe - 1.3.4-1 -- new upstream release: 1.3.4 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Jan 05 2020 Dusty Mabe - 1.3.3-1 -- new upstream release: 1.3.3 - -* Wed Dec 11 2019 Dusty Mabe - 1.3.2-1 -- new upstream release: 1.3.2 - -* Tue Dec 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 - -* Sun Feb 03 2019 Fedora Release Engineering - 1.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Sat Jul 14 2018 Fedora Release Engineering - 1.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild