From e52e796bc18e0528fbe8cac1851ce0cb65b96bd9 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Tue, 28 Jul 2009 18:13:48 +0000
Subject: [PATCH] gem update

---
 .cvsignore                                    |  2 +-
 ...m-nokogiri-1.3.2-rake-valgrind-error.patch | 25 -------------------
 rubygem-nokogiri.spec                         | 15 ++++++-----
 sources                                       |  2 +-
 4 files changed, 11 insertions(+), 33 deletions(-)
 delete mode 100644 rubygem-nokogiri-1.3.2-rake-valgrind-error.patch

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-1.3.2-rake-valgrind-error.patch b/rubygem-nokogiri-1.3.2-rake-valgrind-error.patch
deleted file mode 100644
index b1ebcc3..0000000
--- a/rubygem-nokogiri-1.3.2-rake-valgrind-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 7a43e2e9d0fc3ba3b03bad6117b2ff6c8b9ab3a2
-Author: Mike Dalessio <mike@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|
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index 88fc14b..33d21e9 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -6,15 +6,18 @@
 %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
-Release:	3%{?dist}
+Version:	1.3.3
+Release:	1%{?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}
@@ -68,9 +71,6 @@ gem install \
 	-V --force \
 	%{SOURCE0}
 
-pushd ./%{geminstdir}
-%patch0 -p1 -b .valgrind
-
 %build
 # cflags wrong (-O3 passed), recompiling
 pushd ./%{geminstdir}
@@ -198,6 +198,9 @@ popd
 %{ruby_sitelib}/xsd/
 
 %changelog
+* Wed Jul 29 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.3.3-1
+- 1.3.3
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.3.2-3
 - F-12: Mass rebuild
 
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