From fa312d0b30cf975052207a82ed715459be1fb85d Mon Sep 17 00:00:00 2001 From: Bryan Kearney Date: Mon, 13 Jun 2011 12:18:06 -0400 Subject: [PATCH] Latest 1.0.9 from upstream --- .gitignore | 1 + rubygem-ffi.spec | 31 ++++++++++++++++++++----------- sources | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 8f60448..3449d59 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ ffi-ffi-b69a5e3.tar.gz +/ffi-ffi-1.0.9-0-gb79eb61.tar.gz diff --git a/rubygem-ffi.spec b/rubygem-ffi.spec index 22e758a..ebeeae6 100644 --- a/rubygem-ffi.spec +++ b/rubygem-ffi.spec @@ -3,25 +3,28 @@ %global gemname ffi %global geminstdir %{gemdir}/gems/%{gemname}-%{version} %global libname %{gemname}_c.so -%global githubhash b69a5e3 -%global tarballname ffi-ffi-%{githubhash} +%global githubhash b79eb61 +%global githubbuild 0 +%global tarballname ffi-ffi-%{version}-%{githubbuild}-g%{githubhash} +%global gitinternalname ffi-ffi-%{githubhash} Name: rubygem-%{gemname} -Version: 0.6.3 -Release: 2%{?dist} +Version: 1.0.9 +Release: 1%{?dist} Summary: FFI Extensions for Ruby Group: Development/Languages -License: BSD +License: GPLv3 URL: http://wiki.github.com/ffi/ffi # The source file is hosted at github. You can access this tarball with # the following link: -# http://github.com/ffi/ffi/tarball/0.5.4 +# http://github.com/ffi/ffi/tarball/1.0.9 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) +BuildRequires: ruby ruby-devel rubygems rubygem(rake) rubygem(rake-compiler) libffi-devel rubygem(rspec) rubygem(rspec-core) BuildRequires: pkgconfig +Requires: libffi Requires: rubygems Requires: ruby(abi) = 1.8 Provides: rubygem(%{gemname}) = %{version} @@ -34,7 +37,7 @@ on Ruby and JRuby. Discover why should you write your next extension using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi]. %prep -%setup -q -n %{tarballname} +%setup -q -n %{gitinternalname} %build export CFLAGS="%{optflags}" @@ -47,13 +50,13 @@ rm -rf %{buildroot} mkdir %{buildroot} install -d -m0755 %{buildroot}%{gemdir} install -d -m0755 %{buildroot}%{ruby_sitearch} -cp -R %{_builddir}/%{tarballname}/geminst/* %{buildroot}%{gemdir} +cp -R %{_builddir}/%{gitinternalname}/geminst/* %{buildroot}%{gemdir} mv %{buildroot}%{geminstdir}/lib/%{libname} %{buildroot}%{ruby_sitearch}/%{libname} rm -rf %{buildroot}%{geminstdir}/lib/%{libname} rm -rf %{buildroot}%{geminstdir}/ext %check -rake test +rake -v test %clean rm -rf %{buildroot} @@ -65,7 +68,10 @@ rm -rf %{buildroot} %doc %{geminstdir}/LICENSE %doc %{gemdir}/doc/%{gemname}-%{version} %dir %{geminstdir} -%{geminstdir}/.require_paths +# This file does not exist in 15 +%if 0%{?fedora} <= 14 + %{geminstdir}/.require_paths +%endif %{geminstdir}/Rakefile %{geminstdir}/gen %{geminstdir}/lib @@ -77,6 +83,9 @@ rm -rf %{buildroot} %changelog +* Mon Jun 13 2011 Bryan Kearney - 1.0.9-1 +- Bring in 1.0.9 from upstream. + * Wed Feb 09 2011 Fedora Release Engineering - 0.6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 3976fd9..43e2a42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5db505b7481a979f15c3edfe6eed62ac ffi-ffi-b69a5e3.tar.gz +63bad50d484d539b718a9db7c035a4aa ffi-ffi-1.0.9-0-gb79eb61.tar.gz