From ebcceb0a1d1d727348900bc3010b0d6cce76cf5b Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Feb 23 2013 08:54:17 +0000 Subject: Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 --- diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 78717a0..9f3cb51 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,13 +1,12 @@ %if 0%{?fedora} <= 16 && 0%{?rhel} <= 6 %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") -%global rubyabi 1.8 %endif %global mainver 1.5.6 #%%global prever .beta.4 -%global mainrel 1 +%global mainrel 2 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) @@ -16,7 +15,6 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %global ruby19 1 -%global rubyabi 1.9.1 %global gemdir %{gem_dir} %global geminstdir %{gem_instdir} %global gemsodir %{gem_extdir}/lib @@ -34,7 +32,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gemname} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.2 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Group: Development/Languages License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ @@ -42,7 +40,7 @@ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{mainver}%{?prever}.gem # ./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-allow-non-crosscompile.patch -BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby(release) BuildRequires: ruby(rubygems) ## ## For %%check @@ -57,7 +55,7 @@ Obsoletes: ruby-%{gemname} <= 1.5.2-2 BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: ruby-devel -Requires: ruby(abi) = %{rubyabi} +Requires: ruby(release) Requires: ruby(rubygems) Provides: rubygem(%{gemname}) = %{version}-%{release} @@ -121,12 +119,7 @@ rm -rf tmpunpackdir %build mkdir -p ./%{gemdir} -export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -gem install \ - --local \ - --install-dir ./%{gemdir} \ - -V --force \ - %{gem_name}-%{version}.gem +%gem_install # Permission @@ -151,8 +144,9 @@ mv %{buildroot}%{geminstdir}/lib/%{gemname}/*.so \ %{buildroot}%{gemsodir}/%{gemname}/ # move bin/ files -mkdir -p %{buildroot}%{_prefix} -mv -f %{buildroot}%{gemdir}/bin %{buildroot}%{_prefix} +mkdir -p %{buildroot}%{_bindir} +cp -pa .%{_bindir}/* \ + %{buildroot}%{_bindir}/ # remove all shebang for f in $(find %{buildroot}%{geminstdir} -name \*.rb) @@ -307,6 +301,9 @@ popd %endif %changelog +* Sat Feb 23 2013 Vít Ondruch - 1.5.6-2 +- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 + * Thu Feb 14 2013 Fedora Release Engineering - 1.5.6-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild