Fix sudo wrapper mechanism for fedora

1 files changed, 18 insertions, 6 deletions

diff --git a/vagrant-lxc.spec b/vagrant-lxc.spec
index 1dd6995..ad66a47 100644
--- a/vagrant-lxc.spec
+++ b/vagrant-lxc.spec
@@ -2,14 +2,16 @@
 
 Name: %{vagrant_plugin_name}
 Version: 1.1.0
-Release: 2%{?dist}
-Summary: lxc provider for vagrant
+Release: 3%{?dist}
+Summary: LXC provider for vagrant
 Group: Development/Languages
 License: MIT
 URL: https://github.com/fgrehm/vagrant-lxc
 Source0: https://rubygems.org/gems/%{vagrant_plugin_name}-%{version}.gem
 
-#Requires(pre): shadow-utils
+Patch1: vagrant-lxc-sudo-wrapper.patch
+
+Requires(pre): shadow-utils
 Requires(posttrans): vagrant
 Requires(preun): vagrant
 Requires: ruby(release)
@@ -28,7 +30,7 @@ BuildRequires: rubygem(rspec) < 3
 BuildArch: noarch
 
 %description
-lxc provider for vagrant.
+LXC provider for vagrant.
 
 %package doc
 Summary: Documentation for %{name}
@@ -44,6 +46,8 @@ gem unpack %{SOURCE0}
 
 %setup -q -D -T -n  %{vagrant_plugin_name}-%{version}
 
+%patch1 -p1
+
 gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec
 
 
@@ -56,6 +60,8 @@ mkdir -p %{buildroot}%{vagrant_plugin_dir}
 cp -a .%{vagrant_plugin_dir}/* \
         %{buildroot}%{vagrant_plugin_dir}/
 
+PATH=/usr/bin:$PATH vagrant lxc sudoers
+
 # polkit rule for vagrant group.
 #mkdir -p %{buildroot}%{_datadir}/polkit-1/rules.d
 #install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/polkit-1/rules.d/
@@ -70,8 +76,8 @@ cp -a .%{vagrant_plugin_dir}/* \
 #bundle exec rspec2 spec
 #popd
 
-#%pre
-#getent group vagrant >/dev/null || groupadd -r vagrant
+%pre
+getent group vagrant >/dev/null || groupadd -r vagrant
 
 %posttrans
 %vagrant_plugin_register %{vagrant_plugin_name}
@@ -88,6 +94,7 @@ cp -a .%{vagrant_plugin_dir}/* \
 %exclude %{vagrant_plugin_cache}
 %exclude %{vagrant_plugin_instdir}/.gitignore
 %{vagrant_plugin_spec}
+%{_sysconfdir}/sudoers.d/vagrant-lxc
 
 %exclude %{vagrant_plugin_instdir}/.rspec
 %exclude %{vagrant_plugin_instdir}/.travis.yml
@@ -95,6 +102,7 @@ cp -a .%{vagrant_plugin_dir}/* \
 %{vagrant_plugin_instdir}/Gemfile.lock
 %{vagrant_plugin_instdir}/scripts/lxc-template
 %{vagrant_plugin_instdir}/scripts/pipework
+%{vagrant_plugin_instdir}/scripts/vagrant-lxc-wrapper
 %{vagrant_plugin_instdir}/templates/sudoers.rb.erb
 
 
@@ -112,6 +120,10 @@ cp -a .%{vagrant_plugin_dir}/* \
 %{vagrant_plugin_instdir}/vagrant-spec.config.rb
 
 %changelog
+* Mon Jan 26 2015 Michael Adam <madam@redhat.com> - 1.1.0-3
+- Capitalize summary and description.
+- Fix sudo wrapper and "vagrant lxc sudoers" mechansim from upstream.
+
 * Mon Jan 26 2015 Michael Adam <madam@redhat.com> - 1.1.0-2
 - Move some files from -doc to main package.