From 748bad35643c6d5baf884171ad14c0996914abe9 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Jul 28 2009 18:13:48 +0000 Subject: gem update --- diff --git a/.cvsignore b/.cvsignore index a780337..b4ba417 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -nokogiri-1.3.2.gem +nokogiri-1.3.3.gem diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 811c152..33d21e9 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -6,9 +6,13 @@ %define gemname nokogiri %define geminstdir %{gemdir}/gems/%{gemname}-%{version} +# Note for packager: +# Check if we can update nokogiri to 1.4.0 on < F-12: +# It seems that some functions will be removed on 1.4.0 + Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gemname} -Version: 1.3.2 +Version: 1.3.3 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -19,9 +23,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) BuildRequires: rubygem(hoe) -BuildRequires: rubygem(rake) # Not available yet -# BuildRequires(check): rubygem(rake-compiler) +# BuildRequires: rubygem(hoe-debugging) +BuildRequires: rubygem(rake) +BuildRequires: rubygem(rake-compiler) BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: ruby-devel @@ -58,7 +63,6 @@ This package provides non-Gem support for %{gemname}. %prep %setup -q -T -c -%build mkdir -p ./%{gemdir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" gem install \ @@ -67,14 +71,12 @@ gem install \ -V --force \ %{SOURCE0} +%build # cflags wrong (-O3 passed), recompiling -# Skip until rubygem(rake-compiler) is available -%if 0 pushd ./%{geminstdir} sed -i.flags -e 's|-O3||' ext/nokogiri/extconf.rb find . -name \*.so -or -name \*.o -exec rm -f {} \; -rake -v ext/nokogiri/native.so --trace -%endif +rake -v compile --trace %install rm -rf %{buildroot} @@ -98,7 +100,7 @@ do done # cleanups -rm -rf %{buildroot}%{geminstdir}/ext +rm -rf %{buildroot}%{geminstdir}/{ext,tmp}/ rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths} # The following method is completely copied from rubygem-gettext @@ -167,11 +169,8 @@ create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} rm -rf %{buildroot} %check -# Skip until rubygem(rake-compiler) is available -exit 0 - pushd ./%{geminstdir} -rake test +rake test --trace popd %files @@ -199,6 +198,16 @@ popd %{ruby_sitelib}/xsd/ %changelog +* Wed Jul 29 2009 Mamoru Tasaka - 1.3.3-1 +- 1.3.3 + +* Sat Jul 25 2009 Mamoru Tasaka - 1.3.2-3 +- F-12: Mass rebuild + +* Thu Jul 2 2009 Mamoru Tasaka - 1.3.2-2 +- Enable test +- Recompile with -O2 + * Thu Jun 25 2009 Mamoru Tasaka - 1.3.2-1 - 1.3.2 diff --git a/sources b/sources index 5cb249d..c0814c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5eedaef31f91b0443066a3b44ef66c9 nokogiri-1.3.2.gem +24f7b482886690b723ce6f74d6d879f4 nokogiri-1.3.3.gem