From ab475b9cbed7cfa072e35d293a0e3dabaf28c5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 8 Aug 2016 13:15:27 +0200 Subject: [PATCH] Update to vagrant-libvirt 0.0.33. - Drop the polkit rules. Use libvirt group instead. --- .gitignore | 2 ++ 10-vagrant-libvirt.rules | 11 ------- sources | 3 +- vagrant-libvirt.spec | 62 +++++++++++++++++++++------------------- 4 files changed, 37 insertions(+), 41 deletions(-) delete mode 100644 10-vagrant-libvirt.rules diff --git a/.gitignore b/.gitignore index 348d68d..f230cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /vagrant-libvirt-0.0.30.gem /vagrant-libvirt-0.0.31.gem /vagrant-libvirt-0.0.32.gem +/vagrant-libvirt-0.0.33.gem +/vagrant-spec-9bba7e1228379c0a249a06ce76ba8ea7d276afbe.tar.gz diff --git a/10-vagrant-libvirt.rules b/10-vagrant-libvirt.rules deleted file mode 100644 index 0e2f77d..0000000 --- a/10-vagrant-libvirt.rules +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Allow users in vagrant group to manage libvirt without authentication. - * Copy this file to /usr/share/polkit-1/rules.d/ to activate. - */ -polkit.addRule(function(action, subject) { - if ((action.id == "org.libvirt.unix.manage" - || action.id == "org.libvirt.unix.monitor") - && subject.isInGroup("vagrant")) { - return polkit.Result.YES; - } -}); diff --git a/sources b/sources index 0c10ac9..71fb515 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -662ec6429f0cfbd2967b2419ae79e93a vagrant-libvirt-0.0.32.gem +3bdb3dfb5b77fd1ff27006e00f8bb6b7 vagrant-libvirt-0.0.33.gem +556b3f66ce845aa18557c609639f3349 vagrant-spec-9bba7e1228379c0a249a06ce76ba8ea7d276afbe.tar.gz diff --git a/vagrant-libvirt.spec b/vagrant-libvirt.spec index 9810ccd..94803a4 100644 --- a/vagrant-libvirt.spec +++ b/vagrant-libvirt.spec @@ -1,16 +1,21 @@ %global vagrant_plugin_name vagrant-libvirt +%global vagrant_spec_commit 9bba7e1228379c0a249a06ce76ba8ea7d276afbe + Name: %{vagrant_plugin_name} -Version: 0.0.32 -Release: 2%{?dist} +Version: 0.0.33 +Release: 1%{?dist} Summary: libvirt provider for Vagrant Group: Development/Languages License: MIT URL: https://github.com/pradels/vagrant-libvirt Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem -Source1: 10-vagrant-libvirt.rules +# The library has no official release yet. But since it is just test +# dependency, it should be fine to include the source right here. +# wget https://github.com/mitchellh/vagrant-spec/archive/f1a18fd3e5387328ca83e016e48373aadb67112a/vagrant-spec-f1a18fd3e5387328ca83e016e48373aadb67112a.tar.gz +Source2: https://github.com/mitchellh/vagrant-spec/archive/%{vagrant_spec_commit}/vagrant-spec-%{vagrant_spec_commit}.tar.gz + -Requires(pre): shadow-utils Requires(posttrans): vagrant Requires(preun): vagrant Requires: ruby(release) @@ -18,12 +23,12 @@ Requires: ruby(rubygems) Requires: rubygem(fog-libvirt) Requires: rubygem(nokogiri) => 1.6.0 Requires: rubygem(nokogiri) < 1.7 -Requires: rubygem(multi_json) -Requires: polkit Requires: vagrant BuildRequires: vagrant +BuildRequires: rubygem(rdoc) BuildRequires: rubygem(rspec) < 3 BuildRequires: rubygem(fog-libvirt) +BuildRequires: rubygem(thor) BuildArch: noarch Provides: vagrant(%{vagrant_plugin_name}) = %{version} @@ -42,7 +47,7 @@ Documentation for %{name}. %prep gem unpack %{SOURCE0} -%setup -q -D -T -n %{vagrant_plugin_name}-%{version} +%setup -q -D -T -n %{vagrant_plugin_name}-%{version} gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec @@ -55,25 +60,25 @@ mkdir -p %{buildroot}%{vagrant_plugin_dir} cp -a .%{vagrant_plugin_dir}/* \ %{buildroot}%{vagrant_plugin_dir}/ -# polkit rule for vagrant group. -#mkdir -p %{buildroot}%{_datadir}/polkit-1/rules.d -#install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/polkit-1/rules.d/ -mkdir -p %{buildroot}%{vagrant_plugin_docdir}/polkit -install -m 0644 %{SOURCE1} %{buildroot}%{vagrant_plugin_docdir}/polkit - %check +tar xvzf %{S:2} -C .. + +# Remove the git reference, which is useless in our case. +sed -i '/git/ s/^/#/' ../vagrant-spec-%{vagrant_spec_commit}/vagrant-spec.gemspec + +# Relax the thor dependency, since Fedora ships with newer version. +sed -i '/thor/ s/~>/>=/' ../vagrant-spec-%{vagrant_spec_commit}/vagrant-spec.gemspec + + + pushd .%{vagrant_plugin_instdir} -sed -i '14s|:git.*$|:path => "%{vagrant_dir}"|' Gemfile -sed -i '/pry/d' Gemfile -sed -i '10igem "rspec", "~> 2.0"' Gemfile -sed -i '/rspec/ s|\[\".*\"]|["~> 2.0"]|' vagrant-libvirt.gemspec +sed -i "s|:git => '.*'$|:path => '%{vagrant_dir}'|" Gemfile +sed -i "s|:github => '.*',$|:path => '%{_builddir}/vagrant-spec-%{vagrant_spec_commit}',|" Gemfile +sed -i '/pry/ s/^/#/' Gemfile bundle exec rspec2 spec popd -%pre -getent group vagrant >/dev/null || groupadd -r vagrant - %posttrans %vagrant_plugin_register %{vagrant_plugin_name} @@ -82,30 +87,29 @@ getent group vagrant >/dev/null || groupadd -r vagrant %files %dir %{vagrant_plugin_instdir} +%exclude %{vagrant_plugin_instdir}/.* %license %{vagrant_plugin_instdir}/LICENSE -%doc %{vagrant_plugin_instdir}/README.md %{vagrant_plugin_libdir} %{vagrant_plugin_instdir}/locales %{vagrant_plugin_instdir}/tools %exclude %{vagrant_plugin_cache} -%exclude %{vagrant_plugin_instdir}/.gitignore -%exclude %{vagrant_plugin_instdir}/.travis.yml %{vagrant_plugin_spec} -# polkit -# TODO: Disabled for now, since this might have security implications. -#%exclude %{_datadir}/polkit-1/rules.d/10-vagrant-libvirt.rules %files doc %doc %{vagrant_plugin_docdir} %doc %{vagrant_plugin_instdir}/example_box %doc %{vagrant_plugin_instdir}/CHANGELOG.md -%{vagrant_plugin_instdir}/Rakefile %{vagrant_plugin_instdir}/Gemfile -%{vagrant_plugin_instdir}/vagrant-libvirt.gemspec +%doc %{vagrant_plugin_instdir}/README.md +%{vagrant_plugin_instdir}/Rakefile %{vagrant_plugin_instdir}/spec - +%{vagrant_plugin_instdir}/vagrant-libvirt.gemspec %changelog +* Wed Aug 03 2016 Vít Ondruch - 0.0.33-1 +- Update to vagrant-libvirt 0.0.33. +- Drop the polkit rules. Use libvirt group instead. + * Fri Feb 05 2016 Fedora Release Engineering - 0.0.32-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild