[rubygem-virt-p2v/f18] Numberous directory location fixes

[Matthew Booth]

commit 0061c9dcb26300b482f2d6e5f6c187b0c729233a
Author: Matthew Booth <mbooth at redhat.com>
Date:   Thu Oct 4 15:17:53 2012 +0100

    Numberous directory location fixes

 rubygem-virt-p2v.spec |   69 ++++++++++++++++++++++++++----------------------
 1 files changed, 37 insertions(+), 32 deletions(-)
---
diff --git a/rubygem-virt-p2v.spec b/rubygem-virt-p2v.spec
index 9f01c05..062e8d7 100644
--- a/rubygem-virt-p2v.spec
+++ b/rubygem-virt-p2v.spec
@@ -1,13 +1,15 @@
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname virt-p2v
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+%global gem_name virt-p2v
 
-%global rubyabi 1.9
+%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
+%global rubyabi 1.9.1
+%else
+%global rubyabi 1.8
+%global ruby_vendorarchdir %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
+%endif
 
 Name:           rubygem-virt-p2v
 Version:        0.8.8
-Release:        3%{?dist}%{?extra_release}
+Release:        4%{?dist}%{?extra_release}
 Summary:        Send a machine's storage and metadata to virt-p2v-server
 
 Group:          Applications/System
@@ -29,14 +31,14 @@ ExclusiveArch:  i686
 
 BuildRequires:  perl(Module::Build)
 
-BuildRequires:  rubygems
+BuildRequires:  rubygems-devel
 BuildRequires:  rubygem(rake)
 BuildRequires:  ruby-devel
 
 # rblibssh2 dependencies
 BuildRequires:  libssh2-devel
 
-Requires:   ruby(abi) >= %{rubyabi}
+Requires:   ruby(abi) = %{rubyabi}
 Requires:   rubygems
 Requires:   rubygem(gtk2)
 Requires:   ruby(dbus)
@@ -45,7 +47,7 @@ Requires:   /usr/bin/hwloc-info
 Requires:   NetworkManager
 Requires:   /usr/bin/openvt
 
-Provides:   rubygem(%{gemname}) = %{version}
+Provides:   rubygem(%{gem_name}) = %{version}
 
 
 %description
@@ -96,28 +98,28 @@ pushd p2v/client
 rake gem
 popd
 
-mkdir -p .%{gemdir}
+mkdir -p .%{gem_dir}
 export CONFIGURE_ARGS="--with-cflags='%{optflags}' --with-ldflags='%{optflags}'"
-gem install --local --install-dir .%{gemdir} \
-            --force -V --rdoc p2v/client/pkg/%{gemname}-%{version}.gem
+gem install --local --install-dir .%{gem_dir} \
+            --force -V --rdoc p2v/client/pkg/%{gem_name}-%{version}.gem
 
 
 %install
 rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_bindir} \
-         %{buildroot}%{gemdir} %{buildroot}%{ruby_sitearch}
-cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
+         %{buildroot}%{gem_dir} %{buildroot}%{ruby_vendorarchdir}
+cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
 
-mv %{buildroot}%{geminstdir}/ext/rblibssh2/rblibssh2.so \
-   %{buildroot}%{ruby_sitearch}
-rm -rf %{buildroot}%{geminstdir}/ext \
-       %{buildroot}%{geminstdir}/lib/rblibssh2.so
+mv %{buildroot}%{gem_instdir}/ext/rblibssh2/rblibssh2.so \
+   %{buildroot}%{ruby_vendorarchdir}
+rm -rf %{buildroot}%{gem_instdir}/ext \
+       %{buildroot}%{gem_instdir}/lib/rblibssh2.so
 
-mv %{buildroot}%{gemdir}/bin/* %{buildroot}%{_bindir}
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+mv %{buildroot}%{gem_dir}/bin/* %{buildroot}%{_bindir}
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
-cp COPYING %{buildroot}/%{geminstdir}
+cp COPYING %{buildroot}/%{gem_instdir}
 
 # Install p2v-image-builder
 %global builderdir %{_datadir}/virt-p2v-image-builder
@@ -145,21 +147,21 @@ rm -rf %{buildroot}
 %defattr(-, root, root, -)
 %{_bindir}/virt-p2v
 %{_bindir}/virt-p2v-launcher
-%dir %{geminstdir}
-%{geminstdir}/bin
-%{geminstdir}/lib
-%doc %{geminstdir}/COPYING
-%doc %{geminstdir}/Manifest
-%doc %{geminstdir}/Rakefile
-%doc %{geminstdir}/%{gemname}.gemspec
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%{ruby_sitearch}/rblibssh2.so
+%dir %{gem_instdir}
+%{gem_instdir}/bin
+%{gem_instdir}/lib
+%doc %{gem_instdir}/COPYING
+%doc %{gem_instdir}/Manifest
+%doc %{gem_instdir}/Rakefile
+%doc %{gem_instdir}/%{gem_name}.gemspec
+%{gem_dir}/cache/%{gem_name}-%{version}.gem
+%{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
+%{ruby_vendorarchdir}/rblibssh2.so
 
 
 %files doc
 %defattr(-, root, root, -)
-%{gemdir}/doc/%{gemname}-%{version}
+%{gem_dir}/doc/%{gem_name}-%{version}
 
 
 %files -n virt-p2v-image-builder
@@ -169,6 +171,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 4  2012 Matthew Booth <mbooth at redhat.com> - 0.8.8-4
+- Fix directory locations
+
 * Wed Oct 3  2012 Matthew Booth <mbooth at redhat.com> - 0.8.8-3
 - Update ruby(abi) dependency to >= 1.9