summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <madam@redhat.com>2015-01-22 17:38:53 +0100
committerMichael Adam <obnox@samba.org>2015-01-22 17:39:34 +0100
commit79623acf21b8da3f1f318f3d7a8ef8396de81641 (patch)
tree3a990b5b2f3c96c56e4c5e53e4d42b0253a47bab
downloadfedora-vagrant-libvirt-79623acf21b8da3f1f318f3d7a8ef8396de81641.tar.gz
fedora-vagrant-libvirt-79623acf21b8da3f1f318f3d7a8ef8396de81641.tar.xz
fedora-vagrant-libvirt-79623acf21b8da3f1f318f3d7a8ef8396de81641.zip
Inject vondruch's vagrant-libvirt 0.0.23-3
-rw-r--r--10-vagrant.rules8
-rw-r--r--vagrant-libvirt-use-ruby-libvirt-0.5.x.patch48
-rw-r--r--vagrant-libvirt.spec131
3 files changed, 187 insertions, 0 deletions
diff --git a/10-vagrant.rules b/10-vagrant.rules
new file mode 100644
index 0000000..c833f43
--- /dev/null
+++ b/10-vagrant.rules
@@ -0,0 +1,8 @@
+/* Allow users in vagrant group to manage libvirt without authentication */
+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/vagrant-libvirt-use-ruby-libvirt-0.5.x.patch b/vagrant-libvirt-use-ruby-libvirt-0.5.x.patch
new file mode 100644
index 0000000..e7cdd77
--- /dev/null
+++ b/vagrant-libvirt-use-ruby-libvirt-0.5.x.patch
@@ -0,0 +1,48 @@
+From f68ea1b437cf1d6c9609365257d501aada29a392 Mon Sep 17 00:00:00 2001
+From: Josef Stribny <jstribny@redhat.com>
+Date: Tue, 14 Oct 2014 10:08:39 +0200
+Subject: [PATCH] Use ruby-libvirt 0.5.x
+
+---
+ vagrant-libvirt.gemspec | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/vagrant-libvirt.gemspec b/vagrant-libvirt.gemspec
+index 83005c1..c513c6f 100644
+--- a/vagrant-libvirt.gemspec
++++ b/vagrant-libvirt.gemspec
+@@ -25,16 +25,16 @@ Gem::Specification.new do |s|
+ s.add_development_dependency(%q<rspec-core>, ["= 2.12.2"])
+ s.add_development_dependency(%q<rspec-expectations>, ["= 2.12.1"])
+ s.add_development_dependency(%q<rspec-mocks>, ["= 2.12.1"])
+- s.add_runtime_dependency(%q<fog>, ["= 1.15"])
+- s.add_runtime_dependency(%q<ruby-libvirt>, ["= 0.4.0"])
++ s.add_runtime_dependency(%q<fog>, [">= 1.23"])
++ s.add_runtime_dependency(%q<ruby-libvirt>, [">= 0.4.0"], ["< 0.6.0"])
+ s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6.0"])
+ s.add_development_dependency(%q<rake>, ["= 10.1.0"])
+ else
+ s.add_dependency(%q<rspec-core>, ["= 2.12.2"])
+ s.add_dependency(%q<rspec-expectations>, ["= 2.12.1"])
+ s.add_dependency(%q<rspec-mocks>, ["= 2.12.1"])
+- s.add_dependency(%q<fog>, ["= 1.15"])
+- s.add_dependency(%q<ruby-libvirt>, ["= 0.4.0"])
++ s.add_dependency(%q<fog>, [">= 1.23"])
++ s.add_dependency(%q<ruby-libvirt>, [">= 0.4.0"], ["< 0.6.0"])
+ s.add_dependency(%q<nokogiri>, ["~> 1.6.0"])
+ s.add_dependency(%q<rake>, ["= 10.1.0"])
+ end
+@@ -42,8 +42,8 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<rspec-core>, ["= 2.12.2"])
+ s.add_dependency(%q<rspec-expectations>, ["= 2.12.1"])
+ s.add_dependency(%q<rspec-mocks>, ["= 2.12.1"])
+- s.add_dependency(%q<fog>, ["= 1.15"])
+- s.add_dependency(%q<ruby-libvirt>, ["= 0.4.0"])
++ s.add_dependency(%q<fog>, [">= 1.23"])
++ s.add_dependency(%q<ruby-libvirt>, [">= 0.4.0"], ["< 0.6.0"])
+ s.add_dependency(%q<nokogiri>, ["~> 1.6.0"])
+ s.add_dependency(%q<rake>, ["= 10.1.0"])
+ end
+--
+1.9.3
+
diff --git a/vagrant-libvirt.spec b/vagrant-libvirt.spec
new file mode 100644
index 0000000..9d0fde1
--- /dev/null
+++ b/vagrant-libvirt.spec
@@ -0,0 +1,131 @@
+%global vagrant_plugin_name vagrant-libvirt
+
+Name: %{vagrant_plugin_name}
+Version: 0.0.23
+Release: 3%{?dist}
+Summary: Vagrant provider for libvirt
+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.rules
+# Use fog with ruby-libvirt 0.5.x
+Patch0: vagrant-libvirt-use-ruby-libvirt-0.5.x.patch
+Requires(pre): shadow-utils
+Requires(posttrans): vagrant
+Requires(preun): vagrant
+Requires: ruby(release)
+Requires: ruby(rubygems)
+Requires: rubygem(fog) => 1.23
+Requires: rubygem(fog) < 2
+Requires: rubygem(ruby-libvirt)
+#Requires: rubygem(ruby-libvirt) => 0.5.0
+#Requires: rubygem(ruby-libvirt) < 0.6
+Requires: rubygem(nokogiri) => 1.6.0
+Requires: rubygem(nokogiri) < 1.7
+Requires: rubygem(multi_json)
+Requires: libvirt
+Requires: libvirt-daemon-kvm
+Requires: polkit
+Requires: vagrant
+BuildRequires: vagrant
+BuildRequires: rubygem(rspec) < 3
+BuildRequires: rubygem(fog)
+BuildRequires: rubygem(ruby-libvirt)
+BuildArch: noarch
+
+%description
+Vagrant provider for libvirt.
+
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+Documentation for %{name}.
+
+%prep
+gem unpack %{SOURCE0}
+
+%setup -q -D -T -n %{vagrant_plugin_name}-%{version}
+
+gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec
+
+%patch0 -p1
+
+%build
+gem build %{vagrant_plugin_name}.gemspec
+%vagrant_plugin_install
+
+%install
+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/
+
+%check
+pushd .%{vagrant_plugin_instdir}
+sed -i '/:git/ s|:git.*$|:path => "%{vagrant_dir}"|' Gemfile
+sed -i '/rspec/ s|\[\".*\"]|["~> 2.0"]|' vagrant-libvirt.gemspec
+
+bundle exec rspec2 spec
+popd
+
+%pre
+getent group vagrant >/dev/null || groupadd -r vagrant
+
+%posttrans
+%vagrant_plugin_register %{vagrant_plugin_name}
+
+%preun
+%vagrant_plugin_unregister %{vagrant_plugin_name}
+
+%files
+%dir %{vagrant_plugin_instdir}
+%{vagrant_plugin_libdir}
+%{vagrant_plugin_instdir}/locales
+%{vagrant_plugin_instdir}/tools
+%exclude %{vagrant_plugin_cache}
+%exclude %{vagrant_plugin_instdir}/.gitignore
+%{vagrant_plugin_spec}
+# polkit
+%{_datadir}/polkit-1/rules.d/10-vagrant.rules
+
+%files doc
+%doc %{vagrant_plugin_docdir}
+%doc %{vagrant_plugin_instdir}/example_box
+%doc %{vagrant_plugin_instdir}/CHANGELOG.md
+%doc %{vagrant_plugin_instdir}/LICENSE
+%doc %{vagrant_plugin_instdir}/README.md
+%{vagrant_plugin_instdir}/Rakefile
+%{vagrant_plugin_instdir}/Gemfile
+%{vagrant_plugin_instdir}/vagrant-libvirt.gemspec
+%{vagrant_plugin_instdir}/spec
+
+
+%changelog
+* Wed Nov 26 2014 Vít Ondruch <vondruch@redhat.com> - 0.0.23-3
+- Enable test suite.
+- Update polkit rules.
+
+* Mon Nov 24 2014 Josef Stribny <jstribny@redhat.com> - 0.0.23-2
+- Register and unregister the plugin using macros
+
+* Tue Oct 14 2014 Josef Stribny <jstribny@redhat.com> - 0.0.23-1
+- Update to 0.0.23
+- Use ruby-libvirt 0.5.x
+- Move the rest of the doc files to -doc
+
+* Tue Sep 16 2014 Josef Stribny <jstribny@redhat.com> - 0.0.20-2
+- Register and unregister automatically
+
+* Wed Sep 10 2014 Josef Stribny <jstribny@redhat.com> - 0.0.20-1
+- Update to 0.0.20
+
+* Fri Jun 27 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.0.16-1
+- Initial package for Fedora