rpms/rubygem-nokogiri
7
0
Fork 0
Code Issues Pull Requests Releases Activity

F-21: rebuild for ruby 2.1 / rubygems 2.2

Browse Source
This commit is contained in:
Mamoru TASAKA 2014-04-17 17:20:49 +09:00
parent 5d1563b4f8
commit 81cacd0c16
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rubygem-nokogiri.spec
View File

@ -6,7 +6,7 @@
%global mainver 1.6.1 %global mainver 1.6.1
#%%global prever .beta.4 #%%global prever .beta.4
%global mainrel 1 %global mainrel 2
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
@ -35,11 +35,11 @@
Summary: An HTML, XML, SAX, and Reader parser Summary: An HTML, XML, SAX, and Reader parser
Name: rubygem-%{gemname} Name: rubygem-%{gemname}
Version: %{mainver} Version: %{mainver}
Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1 Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}
Group: Development/Languages Group: Development/Languages
License: MIT License: MIT
URL: http://nokogiri.rubyforge.org/nokogiri/ URL: http://nokogiri.rubyforge.org/nokogiri/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{mainver}%{?prever}.gem Source0: https://rubygems.org/gems/%{gemname}-%{mainver}%{?prever}.gem
# ./test/html/test_element_description.rb:62 fails, as usual...... # ./test/html/test_element_description.rb:62 fails, as usual......
# Patch0: rubygem-nokogiri-1.5.0.beta3-test-failure.patch # Patch0: rubygem-nokogiri-1.5.0.beta3-test-failure.patch
#Patch0: rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch #Patch0: rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch
@ -157,9 +157,19 @@ cp -a ./%{gemdir}/* %{buildroot}%{gemdir}
find %{buildroot} -name \*.orig_\* | xargs rm -vf find %{buildroot} -name \*.orig_\* | xargs rm -vf
# move arch dependent files to %%gem_extdir # move arch dependent files to %%gem_extdir
%if 0%{?fedora} >= 21
mkdir -p %{buildroot}%{gem_extdir_mri}
cp -a ./%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
pushd %{buildroot}
rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log}
popd
%else
mkdir -p %{buildroot}%{gemsodir}/%{gemname} mkdir -p %{buildroot}%{gemsodir}/%{gemname}
mv %{buildroot}%{geminstdir}/lib/%{gemname}/*.so \ mv %{buildroot}%{geminstdir}/lib/%{gemname}/*.so \
%{buildroot}%{gemsodir}/%{gemname}/ %{buildroot}%{gemsodir}/%{gemname}/
%endif
# move bin/ files # move bin/ files
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
@ -191,7 +201,12 @@ LANG=ja_JP.UTF-8
pushd ./%{geminstdir} pushd ./%{geminstdir}
# Need investigation. For now anyway build # Need investigation. For now anyway build
ruby -I.:lib:test \ ruby \
%if 0%{?fedora} >= 21
-I.:lib:test:ext \
%else
-I.:lib:test \
%endif
-e \ -e \
"require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \ "require 'test/helper' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \
echo "Please investigate this" echo "Please investigate this"
@ -214,7 +229,11 @@ popd
%exclude %{geminstdir}/Gemfile %exclude %{geminstdir}/Gemfile
%{geminstdir}/bin/ %{geminstdir}/bin/
%{geminstdir}/lib/ %{geminstdir}/lib/
%if 0%{?fedora} >= 21
%exclude %{gemdir}/cache/%{gemname}-%{mainver}%{?prever}.gem
%else
%{gemdir}/cache/%{gemname}-%{mainver}%{?prever}.gem %{gemdir}/cache/%{gemname}-%{mainver}%{?prever}.gem
%endif
%{gemdir}/specifications/%{gemname}-%{mainver}%{?prever}.gemspec %{gemdir}/specifications/%{gemname}-%{mainver}%{?prever}.gemspec
%if 0 %if 0
@ -233,6 +252,9 @@ popd
%{gemdir}/doc/%{gemname}-%{mainver}%{?prever}/ %{gemdir}/doc/%{gemname}-%{mainver}%{?prever}/
%changelog %changelog
* Thu Apr 17 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.6.1-2
- F-21: rebuild for ruby 2.1 / rubygems 2.2
* Wed Dec 25 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.6.1-1 * Wed Dec 25 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.6.1-1
- 1.6.1 - 1.6.1