rpms/rubygem-nokogiri/devel rubygem-nokogiri-1.3.2-rake-valgrind-error.patch, NONE, 1.1 rubygem-nokogiri.spec, 1.8, 1.9
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Jul 2 05:37:07 UTC 2009
Author: mtasaka
Update of /cvs/extras/rpms/rubygem-nokogiri/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13263
Modified Files:
rubygem-nokogiri.spec
Added Files:
rubygem-nokogiri-1.3.2-rake-valgrind-error.patch
Log Message:
* Thu Jul 2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.2-2
- Enable test
- Recompile with -O2
rubygem-nokogiri-1.3.2-rake-valgrind-error.patch:
--- NEW FILE rubygem-nokogiri-1.3.2-rake-valgrind-error.patch ---
commit 7a43e2e9d0fc3ba3b03bad6117b2ff6c8b9ab3a2
Author: Mike Dalessio <mike at csa.net>
Date: Fri Jun 26 08:14:44 2009 -0400
ensuring rake will run even if hoe-debugging isn't installed
diff --git a/Rakefile b/Rakefile
index a13dfaf..9434336 100644
--- a/Rakefile
+++ b/Rakefile
@@ -180,9 +180,11 @@ unless windows || java || ENV['NOKOGIRI_FFI']
Rake::Task[task_name].prerequisites << GENERATED_TOKENIZER
end
- Rake::Task[:test].prerequisites << :compile
- ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|
- Rake::Task["test:#{task_name}"].prerequisites << :compile
+ if Rake::Task.task_defined?(:valgrind)
+ Rake::Task[:test].prerequisites << :compile
+ ['valgrind', 'valgrind:mem', 'valgrind:mem0'].each do |task_name|
+ Rake::Task["test:#{task_name}"].prerequisites << :compile
+ end
end
else
[:test, :check_manifest].each do |task_name|
Index: rubygem-nokogiri.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-nokogiri/devel/rubygem-nokogiri.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- rubygem-nokogiri.spec 24 Jun 2009 18:22:46 -0000 1.8
+++ rubygem-nokogiri.spec 2 Jul 2009 05:36:36 -0000 1.9
@@ -9,19 +9,21 @@
Summary: An HTML, XML, SAX, and Reader parser
Name: rubygem-%{gemname}
Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://nokogiri.rubyforge.org/nokogiri/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0: rubygem-nokogiri-1.3.2-rake-valgrind-error.patch
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 +60,6 @@ This package provides non-Gem support fo
%prep
%setup -q -T -c
-%build
mkdir -p ./%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
gem install \
@@ -67,14 +68,15 @@ gem install \
-V --force \
%{SOURCE0}
+pushd ./%{geminstdir}
+%patch0 -p1 -b .valgrind
+
+%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 %{r
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,10 @@ popd
%{ruby_sitelib}/xsd/
%changelog
+* Thu Jul 2 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.2-2
+- Enable test
+- Recompile with -O2
+
* Thu Jun 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.3.2-1
- 1.3.2
More information about the fedora-extras-commits
mailing list