Drop -devel sub-package.

3 files changed, 26 insertions, 36 deletions

diff --git a/macros.vagrant b/macros.vagrant
index 08df448..0868b11 100644
--- a/macros.vagrant
+++ b/macros.vagrant
@@ -1,3 +1,8 @@
+%vagrant_dir %{_datadir}/%{name}
+
+%vagrant_plugin_conf_dir %{_sharedstatedir}/%{name}
+%vagrant_plugin_conf %{vagrant_plugin_conf_dir}/plugins.json
+
 # Common locations for Vagrant plugin gems
 %vagrant_plugin_dir %{vagrant_dir}/gems
 %vagrant_plugin_instdir %{vagrant_plugin_dir}/gems/%{vagrant_plugin_name}-%{version}
@@ -25,3 +30,18 @@ gem install \\\
         --backtrace \\\
         %{-n*}%{!?-n:%{vagrant_plugin_name}-%{version}.gem} \
 %{nil}
+
+# Macros to (un)register Vagrant gem
+%vagrant_plugin_register() \
+%{_bindir}/ruby -e ' \\\
+$LOAD_PATH.unshift "%{vagrant_dir}/lib"; \\\
+require "vagrant/plugin/manager"; \\\
+Vagrant::Plugin::StateFile.new(Pathname.new(File.expand_path "%{vagrant_plugin_conf}")).add_plugin "%1";' \
+%{nil}
+
+%vagrant_plugin_unregister() \
+%{_bindir}/ruby -e ' \\\
+$LOAD_PATH.unshift "%{vagrant_dir}/lib"; \\\
+require "vagrant/plugin/manager"; \\\
+Vagrant::Plugin::StateFile.new(Pathname.new(File.expand_path "%{vagrant_plugin_conf}")).remove_plugin "%1";' \
+%{nil}
diff --git a/macros.vagrant_plugin b/macros.vagrant_plugin
deleted file mode 100644
index c72457f..0000000
--- a/macros.vagrant_plugin
+++ /dev/null
@@ -1,19 +0,0 @@
-%vagrant_dir %{_datadir}/%{name}
-
-%vagrant_plugin_conf_dir %{_sharedstatedir}/%{name}
-%vagrant_plugin_conf %{vagrant_plugin_conf_dir}/plugins.json
-
-# Macros to (un)register Vagrant gem
-%vagrant_plugin_register() \
-%{_bindir}/ruby -e ' \\\
-$LOAD_PATH.unshift "%{vagrant_dir}/lib"; \\\
-require "vagrant/plugin/manager"; \\\
-Vagrant::Plugin::StateFile.new(Pathname.new(File.expand_path "%{vagrant_plugin_conf}")).add_plugin "%1";' \
-%{nil}
-
-%vagrant_plugin_unregister() \
-%{_bindir}/ruby -e ' \\\
-$LOAD_PATH.unshift "%{vagrant_dir}/lib"; \\\
-require "vagrant/plugin/manager"; \\\
-Vagrant::Plugin::StateFile.new(Pathname.new(File.expand_path "%{vagrant_plugin_conf}")).remove_plugin "%1";' \
-%{nil}
diff --git a/vagrant.spec b/vagrant.spec
index 98b9daa..b02906c 100644
--- a/vagrant.spec
+++ b/vagrant.spec
@@ -4,7 +4,7 @@
 
 Name: vagrant
 Version: 1.6.5
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Build and distribute virtualized development environments
 Group: Development/Languages
 License: MIT
@@ -22,13 +22,11 @@ Source2: https://github.com/mitchellh/%{name}-spec/archive/%{vagrant_spec_commit
 # for RubyGems and Bundler are in place
 Source3: patches.rb
 
-Source4: macros.vagrant_plugin
-Source5: macros.vagrant
+Source4: macros.vagrant
 
 # The load directive is supported since RPM 4.12, i.e. F21+. The build process
 # fails on older Fedoras.
 %{?load:%{SOURCE4}}
-%{?load:%{SOURCE5}}
 
 Patch0: vagrant-1.6.5-fix-dependencies.patch
 
@@ -83,13 +81,6 @@ BuildArch: noarch
 %description doc
 Documentation for %{name}.
 
-%package devel
-Summary: Package shipping development files for Vagrant
-
-%description devel
-Package shipping macros for convinient plugin registration and
-unregistration.
-
 %prep
 %setup -q
 
@@ -127,8 +118,6 @@ sed -i -e "11irequire 'vagrant/patches'" %{buildroot}%{vagrant_dir}/lib/vagrant.
 # Install Vagrant macros
 mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
 cp %{SOURCE4} %{buildroot}%{_rpmconfigdir}/macros.d/
-sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}_plugin
-cp %{SOURCE5} %{buildroot}%{_rpmconfigdir}/macros.d/
 sed -i "s/%%{name}/%{name}/" %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
 
 
@@ -174,7 +163,7 @@ getent group vagrant >/dev/null || groupadd -r vagrant
 %{bashcompletion_dir}/%{name}
 %dir %{_sharedstatedir}/%{name}
 %ghost %{_sharedstatedir}/%{name}/plugins.json
-%{_rpmconfigdir}/macros.d/macros.%{name}_plugin
+%{_rpmconfigdir}/macros.d/macros.%{name}
 
 %files doc
 %doc CONTRIBUTING.md CHANGELOG.md README.md
@@ -184,11 +173,11 @@ getent group vagrant >/dev/null || groupadd -r vagrant
 %{vagrant_dir}/test
 %{vagrant_dir}/vagrant-spec.config.example.rb
 
-%files devel
-%{_rpmconfigdir}/macros.d/macros.%{name}
-
 
 %changelog
+* Wed Nov 26 2014 Vít Ondruch <vondruch@redhat.com> - 1.6.5-14
+- Drop -devel sub-package.
+
 * Tue Nov 25 2014 Josef Stribny <jstribny@redhat.com> - 1.6.5-13
 - Create -devel sub-package