Attachment 879035 Details for Bug 975332 – dist-git patch #2

[patch] dist-git patch #2

0001-Fix-install-location-of-built-library-and-gemspec.patch (text/plain), 3.15 KB, created by Dominic Cleal on 2014-03-26 15:11:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominic Cleal

Created: 2014-03-26 15:11:09 UTC

Size: 3.15 KB

patch

obsolete

>From e1e2cb61d80e7980debac2d1c27987c3cba6f472 Mon Sep 17 00:00:00 2001
>From: Dominic Cleal <dcleal@redhat.com>
>Date: Wed, 26 Mar 2014 13:38:35 +0000
>Subject: [PATCH] Fix install location of built library and gemspec
>
>Resolves: RHBZ#975332
>---
> rubygem-ffi.spec | 34 ++++++++++++++--------------------
> 1 file changed, 14 insertions(+), 20 deletions(-)
>
>diff --git a/rubygem-ffi.spec b/rubygem-ffi.spec
>index 4ec4197..fa9037a 100644
>--- a/rubygem-ffi.spec
>+++ b/rubygem-ffi.spec
>@@ -1,21 +1,14 @@
>-%global gem_name        ffi
>-%global libname         %{gem_name}_c.so
>-%global githubhash      b79eb61
>-%global githubbuild     0
>-%global tarballname     ffi-ffi-%{version}-%{githubbuild}-g%{githubhash}
>+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
>+%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
>-%global gem_spec        %{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
>-%global gem_extdir      %{_libdir}/gems/exts/%{gem_name}-%{version}
>-%global gem_docdir      %{gem_dir}/doc/%{gem_name}-%{version}
>-
> 
> Name:           rubygem-%{gem_name}
> Version:        1.0.9
>-Release:        8%{?dist}
>+Release:        9%{?dist}
> Summary:        FFI Extensions for Ruby
> Group:          Development/Languages
> 
>@@ -27,8 +20,7 @@ URL:            http://wiki.github.com/ffi/ffi
> Source0:        %{tarballname}.tar.gz
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>-BuildRequires:  ruby ruby-devel rubygems rubygem(rake) rubygem(rake-compiler) libffi-devel rubygem(rspec-core)
>-BuildRequires: ruby-devel
>+BuildRequires:  ruby-devel rubygems-devel rubygem(rake) rubygem(rake-compiler) libffi-devel rubygem(rspec-core)
> BuildRequires:  pkgconfig
> Requires:       libffi
> Requires: ruby(rubygems)
>@@ -55,10 +47,9 @@ 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_libdir}/%{libname} %{buildroot}%{ruby_sitearch}/%{libname}
> rm -rf %{buildroot}%{gem_instdir}/ext
> 
> %check
>@@ -85,12 +76,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