[marisa] Ruby: Rebuild for ruby 2.1 / rubygems 2.2
Mamoru TASAKA
mtasaka at fedoraproject.org
Sat May 3 09:21:51 UTC 2014
commit 5f0b393c6f25cdfcc6d40118bbd438f6d46398ec
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Sat May 3 18:22:07 2014 +0900
Ruby: Rebuild for ruby 2.1 / rubygems 2.2
- Ruby: regenerate binding files with newer swig for -Werror=format-security
- Perl: don't use %prefix/local, move installation directory to vendor directory
marisa.spec | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/marisa.spec b/marisa.spec
index ce72a72..3093186 100644
--- a/marisa.spec
+++ b/marisa.spec
@@ -1,6 +1,6 @@
Name: marisa
Version: 0.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Static and spece-efficient trie data structure library
License: BSD or LGPL
@@ -65,7 +65,7 @@ Summary: Ruby language binding for marisa
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} >= 19
-Requires: ruby(release) = 2.0.0
+Requires: ruby(release)
%else
Requires: ruby(abi) = 1.9.1
%endif
@@ -86,7 +86,7 @@ make %{?_smp_mflags}
# build Perl bindings
pushd bindings/perl
-%{__perl} Makefile.PL INC="-I%{_builddir}/%{name}-%{version}/lib" LIBS="-L%{_builddir}/%{name}-%{version}/lib/.libs"
+%{__perl} Makefile.PL INC="-I%{_builddir}/%{name}-%{version}/lib" LIBS="-L%{_builddir}/%{name}-%{version}/lib/.libs" INSTALLDIRS=vendor
make %{?_smp_mflags}
popd
@@ -97,6 +97,11 @@ pushd bindings/python
popd
# build Ruby bindings
+# Regenerate ruby bindings
+pushd bindings
+make swig-ruby
+popd
+
pushd bindings/ruby
ruby extconf.rb --with-opt-include="%{_builddir}/%{name}-%{version}/lib" --with-opt-lib="%{_builddir}/%{name}-%{version}/lib/.libs" --vendor
make
@@ -146,8 +151,8 @@ find $RPM_BUILD_ROOT -name 'perllocal.pod' -exec rm -f {} ';'
%{_bindir}/marisa*
%files perl
-%{perl_sitearch}/*
-%exclude %dir %{perl_sitearch}/auto/
+%{perl_vendorarch}/*
+%exclude %dir %{perl_vendorarch}/auto/
%files python
%{python_sitearch}/*
@@ -157,6 +162,11 @@ find $RPM_BUILD_ROOT -name 'perllocal.pod' -exec rm -f {} ';'
%changelog
+* Sat May 3 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.2.4-5
+- Ruby: Rebuild for ruby 2.1 / rubygems 2.2
+- Ruby: regenerate binding files with newer swig for -Werror=format-security
+- Perl: don't use %%prefix/local, move installation directory to vendor directory
+
* Tue Aug 13 2013 Daiki Ueno <dueno at redhat.com> - 0.2.4-4
- disable workaround for ruby bindings needed for F19 (Closes:#992166)
More information about the scm-commits
mailing list