diff --git a/.gitignore b/.gitignore index 58dae8b..d1f0718 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -/vagrant-sshfs-*.gem README.packit +/v1.3.1.tar.gz +/v1.3.2.tar.gz +/v1.3.3.tar.gz +/v1.3.4.tar.gz diff --git a/.packit.yaml b/.packit.yaml index b092074..d62e40e 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -17,7 +17,7 @@ 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" + post-upstream-clone: "curl -LO https://src.fedoraproject.org/rpms/vagrant-sshfs/raw/master/f/vagrant-sshfs.spec" # We are downloading (curl) to ./vagrant-sshfs.spec specfile_path: vagrant-sshfs.spec diff --git a/README.md b/README.md index 8ad78b6..4bd81f3 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,10 @@ You'll need a packit.yaml file created. ``` $ cat < ~/.config/packit.yaml debug: false +dry_run: false authentication: -# github.com: -# token: XXX + github.com: + token: XXX pagure: token: XXX instance_url: "https://src.fedoraproject.org" @@ -17,9 +18,9 @@ EOF The tokens come from: - https://src.fedoraproject.org/settings#nav-api-tab -- https://github.com/settings/tokens (not needed for this) +- https://github.com/settings/tokens -Packit uses the `rawhide` branch. Make sure the `rawhide` branch +Packit uses the `master` branch. Make sure the `master` 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. @@ -27,14 +28,14 @@ upstream repo. Then from this repo you can open a PR with: ``` -$ packit propose-downstream --dist-git-branch rawhide +$ packit propose-update ``` 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 +$ packit propose-update https://github.com/dustymabe/vagrant-sshfs.git 1.3.4 ``` You can kick off a build with: diff --git a/sources b/sources index f807e05..1f0001d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vagrant-sshfs-1.3.7.gem) = 3a00062037ee03284a3d19b60623eb33da715fcca61f21dbe7269254878ea068f7ea56c94c5c27773a6fe61031d9af896e1abed1067187c118643be00719df27 +SHA512 (v1.3.4.tar.gz) = cf1e7392543111af3224506197a179097c4118a9f4ee93747849b2ee69cc5cdeb2ab3e7858e290fd8598f6b5a4cdbb69a86428d2523416f0f04ba48cb2199e9e diff --git a/vagrant-sshfs.spec b/vagrant-sshfs.spec index fa105d3..13ff4dd 100644 --- a/vagrant-sshfs.spec +++ b/vagrant-sshfs.spec @@ -2,20 +2,16 @@ %global vagrant_plugin_name vagrant-sshfs Name: %{vagrant_plugin_name} -Version: 1.3.7 -Release: 14%{?dist} +Version: 1.3.4 +Release: 1%{?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 +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 -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} @@ -35,13 +31,20 @@ BuildArch: noarch Documentation for %{name}. %prep -%setup -b 0 -q -n %{vagrant_plugin_name}-%{version} +%setup -T -b 0 -q -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 # remove dependencies on windows libraries (needed for windows, not linux) -%gemspec_remove_dep -s ../%{vagrant_plugin_name}-%{version}.gemspec -g win32-process +sed -i '/win32-process/d' %{vagrant_plugin_name}.gemspec %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 +52,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 @@ -72,77 +77,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