From febe1a5ba73793ccfd9ef82b47ea048bdeb4a7b6 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 18:53:32 +0100 Subject: [PATCH] update to 2.2.14 [release 2.2.14-1mamba;Mon Nov 23 2020] --- vagrant.spec | 77 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/vagrant.spec b/vagrant.spec index c62b2ac..072477a 100644 --- a/vagrant.spec +++ b/vagrant.spec @@ -1,6 +1,6 @@ %define ruby_apiver %(echo %ruby_version|cut -d. -f1-2).0 Name: vagrant -Version: 2.2.9 +Version: 2.2.14 Release: 1mamba Summary: A tool for building and distributing development environments Group: Applications/Development @@ -8,19 +8,17 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://www.vagrantup.com -## GITSOURCE https://github.com/hashicorp/vagrant.git v2.1.2 Source: https://github.com/hashicorp/vagrant.git/v%{version}/vagrant-%{version}.tar.bz2 +Source1: https://github.com/hashicorp/vagrant-installers.git/v%{version}.dev+main/vagrant-installers-%{version}.tar.bz2 License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig BuildRequires: libffi-devel -BuildRequires: libgcc -BuildRequires: libgmp-devel -BuildRequires: libstdc++6-devel -BuildRequires: perl-devel -BuildRequires: ruby-devel +BuildRequires: libruby-devel ## AUTOBUILDREQ-END BuildRequires: ruby +BuildRequires: go Requires: ruby Requires: libarchive-tools Requires: VirtualBox @@ -29,48 +27,81 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Vagrant is a tool for building and distributing development environments. -%prep -%setup -q +%debug_package +%prep +%setup -q -a1 +mv vagrant-installers-%{version} vagrant-installers touch .gitignore %build gem build vagrant.gemspec +cd vagrant-installers/substrate/launcher +go get github.com/mitchellh/osext + +go build \ + -trimpath \ + -buildmode=pie \ + -ldflags "-extldflags \"${LDFLAGS}\"" \ + -o vagrant + %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -gemdir="$(ruby -rrubygems -e'puts Gem.default_dir')" - -gem install vagrant-%{version}.gem -i %{buildroot}%{ruby_sitelib} \ - --no-ri --no-rdoc +INSTALLERS_DIR=vagrant-installers/substrate +EMBEDDED_DIR=%{buildroot}%{_datadir}/vagrant/embedded -rm -f %{buildroot}%{_libdir}/ruby/gems/%{ruby_apiver}/bin/rake -rm -rf %{buildroot}%{ruby_sitelib}/cache +install -d %{buildroot}/usr/{bin,share/bash-completion/completions} +install -d ${EMBEDDED_DIR}/rgloader + +install -Dm644 ${INSTALLERS_DIR}/common/gemrc ${EMBEDDED_DIR}/etc/gemrc +install -Dm644 ${INSTALLERS_DIR}/{common,linux}/rgloader/* \ + ${EMBEDDED_DIR}/rgloader/ -install -d -m0755 %{buildroot}${gemdir} -mv %{buildroot}%{ruby_sitelib}/* %{buildroot}${gemdir}/ +echo "{ \"vagrant_version\": \"%{version}\" }" > ${EMBEDDED_DIR}/manifest.json -install -d -m0755 %{buildroot}%{_bindir} +GEM_PATH=${EMBEDDED_DIR}/gems/%{version} GEM_HOME="$GEM_PATH" \ + GEMRC=${EMBEDDED_DIR}/etc/gemrc \ + gem install %{name}-%{version}.gem --no-document --prerelease -ln -s %{_libdir}/ruby/gems/%{ruby_apiver}/bin/vagrant %{buildroot}%{_bindir}/vagrant +install -Dm755 ${INSTALLERS_DIR}/launcher/vagrant \ + %{buildroot}%{_datadir}/vagrant/bin/vagrant + +ln -s %{_datadir}/vagrant/bin/vagrant %{buildroot}%{_bindir}/vagrant install -Dm644 contrib/bash/completion.sh \ %{buildroot}%{_datadir}/bash-completion/completions/vagrant +install -Dm644 contrib/vim/vagrantfile.vim \ + %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/vagrantfile.vim + %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %files %defattr(-,root,root) %{_bindir}/vagrant -%{_libdir}/ruby/gems/%{ruby_apiver}/bin/* -%{_libdir}/ruby/gems/%{ruby_apiver}/extensions/* -%{_libdir}/ruby/gems/%{ruby_apiver}/gems/* -%{_libdir}/ruby/gems/%{ruby_apiver}/specifications/* +%dir %{_datadir}/vagrant +%dir %{_datadir}/vagrant/bin +%{_datadir}/vagrant/bin/vagrant +%dir %{_datadir}/vagrant/embedded +%dir %{_datadir}/vagrant/embedded/etc +%{_datadir}/vagrant/embedded/etc/gemrc +%dir %{_datadir}/vagrant/embedded/gems/ +%dir %{_datadir}/vagrant/embedded/gems/%{version} +%{_datadir}/vagrant/embedded/gems/%{version}/* +%{_datadir}/vagrant/embedded/manifest.json +%dir %{_datadir}/vagrant/embedded/rgloader +%{_datadir}/vagrant/embedded/rgloader/loader.rb +%{_datadir}/vagrant/embedded/rgloader/rgloader26.linux.x86_64.so +%{_datadir}/vim/vimfiles/ftdetect/vagrantfile.vim %{_datadir}/bash-completion/completions/vagrant %doc LICENSE %changelog +* Mon Nov 23 2020 Silvan Calarco 2.2.14-1mamba +- update to 2.2.14 + * Fri May 15 2020 Automatic Build System 2.2.9-1mamba - automatic version update by autodist