Attachment 878984 Details for Bug 975332 – dist-git patch

[patch] dist-git patch

0001-Fix-install-location-of-built-library-and-gemspec.patch (text/plain), 2.40 KB, created by Dominic Cleal on 2014-03-26 12:49:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominic Cleal

Created: 2014-03-26 12:49:51 UTC

Size: 2.40 KB

patch

obsolete

>From 21393d4f3161b6208062b6ebf1c4988515167f0e Mon Sep 17 00:00:00 2001
>From: Dominic Cleal <dcleal@redhat.com>
>Date: Wed, 26 Mar 2014 11:52:06 +0000
>Subject: [PATCH] Fix install location of built library and gemspec
>
>Resolves: RHBZ#975332
>---
> rubygem-ffi.spec | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/rubygem-ffi.spec b/rubygem-ffi.spec
>index 4ec4197..b118abb 100644
>--- a/rubygem-ffi.spec
>+++ b/rubygem-ffi.spec
>@@ -1,10 +1,11 @@
>+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
>+%{!?gem_dir: %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)}
> %global gem_name        ffi
> %global libname         %{gem_name}_c.so
> %global githubhash      b79eb61
> %global githubbuild     0
> %global tarballname     ffi-ffi-%{version}-%{githubbuild}-g%{githubhash}
> %global gitinternalname ffi-ffi-%{githubhash}
>-%global gem_dir         /usr/share/rubygems
> %global gem_instdir     %{gem_dir}/gems/%{gem_name}-%{version}
> %global gem_libdir      %{gem_instdir}/lib
> %global gem_cache       %{gem_dir}/cache/%{gem_name}-%{version}.gem
>@@ -15,7 +16,7 @@
> 
> Name:           rubygem-%{gem_name}
> Version:        1.0.9
>-Release:        8%{?dist}
>+Release:        9%{?dist}
> Summary:        FFI Extensions for Ruby
> Group:          Development/Languages
> 
>@@ -55,10 +56,10 @@ gem install -V -d --local --no-ri -i ./geminst --force pkg/%{gem_name}-%{version
> rm -rf %{buildroot}
> mkdir %{buildroot}
> install -d -m0755 %{buildroot}%{gem_dir}
>-install -d -m0755  %{buildroot}%{gem_extdir}/lib
>+install -d -m0755  %{buildroot}%{ruby_sitearch}
> cp -R %{_builddir}/%{gitinternalname}/geminst/* %{buildroot}%{gem_dir}
>-mv %{buildroot}%{gem_libdir}/%{libname} %{buildroot}%{gem_extdir}/lib/%{libname}
>-rm -rf %{buildroot}%{gem_libdir}/%{libname}
>+mv %{buildroot}%{gem_instdir}/lib/%{libname} %{buildroot}%{ruby_sitearch}/%{libname}
>+rm -rf %{buildroot}%{gem_instdir}/lib/%{libname}
> rm -rf %{buildroot}%{gem_instdir}/ext
> 
> %check
>@@ -85,12 +86,15 @@ rm -rf %{buildroot}
> %{gem_libdir}
> %{gem_instdir}/spec
> %{gem_instdir}/tasks
>-%{gem_extdir}/
>+%{ruby_sitearch}/%{libname}
> %{gem_cache}
> %{gem_spec}
> 
> 
> %changelog
>+* Wed Mar 26 2014 Dominic Cleal <dcleal@redhat.com> - 1.0.9-9
>+- Fix install location of built library and gemspec (RHBZ#975332)
>+
> * Thu Jan 07 2013 Bryan Kearney <bkearney@redhat.com> - 1.0.9-8
> - Change the ruby version back to 1.8
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 975332: 878984 | 879035