From ca01c8a6a9fdedd3904c4f6ad7302f5cb5413938 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Thu, 10 Feb 2011 00:11:50 +0900
Subject: [PATCH] - 0.90.7

---
 .gitignore         |  1 +
 rubygem-pango.spec | 35 +++++++++++++----------------------
 sources            |  2 +-
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0abe1a2..6ba2853 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /pango-0.90.3.gem
 /pango-0.90.4.gem
 /pango-0.90.5.gem
+/pango-0.90.7.gem
diff --git a/rubygem-pango.spec b/rubygem-pango.spec
index abbcd73..9a13f21 100644
--- a/rubygem-pango.spec
+++ b/rubygem-pango.spec
@@ -5,14 +5,14 @@
 %global	gemname	pango
 %global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}
 
-%global	glibminver	0.90.5
-%global	obsoleteevr	0.90.5-1.999
+%global	glibminver	0.90.7
+%global	obsoleteevr	0.90.7-1.999
 
 %global	rubyabi	1.8
 
 Summary:	Ruby binding of pango-1.x
 Name:		rubygem-%{gemname}
-Version:	0.90.5
+Version:	0.90.7
 Release:	2%{?dist}
 Group:		Development/Languages
 # from README
@@ -26,7 +26,8 @@ BuildRequires:	rubygem-cairo-devel
 BuildRequires:	rubygem-glib2-devel >= %{glibminver}
 BuildRequires:	ruby-devel
 BuildRequires:	pango-devel
-BuildRequires(check):	rubygem(test-unit)
+# %%check
+BuildRequires:	rubygem(test-unit)
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	rubygems
 Requires:	rubygem(cairo)
@@ -110,9 +111,11 @@ grep -rl '%{gemname}.so' . | \
 		-e "\@require@s|'%{gemname}.so'|'ruby-gnome2/%{gemname}.so'|" \
 		-e '\@require@s|"%{gemname}.so"|"ruby-gnome2/%{gemname}.so"|'
 
-%install
-rm -rf %{buildroot}
+# Fix up Rakefile for "gnome2-raketask" requirement
+sed -i -e "/require.*gnome2-raketask/s|^\(.*\)|begin\n  \1\nrescue LoadError\n  require 'rubygems'\n  require 'gnome2-raketask'\nend\n|" \
+	Rakefile
 
+%install
 # Once copy all
 mkdir -p %{buildroot}%{gemdir}
 cp -a .%{gemdir}/* \
@@ -209,24 +212,9 @@ ln -sf /bin/true make
 export PATH=$(pwd):$PATH
 popd
 
-cat > glib-test-init.rb <<EOF
-\$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
-\$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "test"))
-
-begin
-	require 'rubygems'
-	gem 'test-unit'
-	require 'test/unit'
-rescue LoadError
-end
-EOF
-
 # test_default(TestLanguage) [./test/test-language.rb] needs LANG=ja_JP.UTF-8, for example
 LANG=en_US.UTF-8
-ruby ./test/run-test.rb
-
-%clean
-rm -rf %{buildroot}
+ruby -Ilib:test ./test/run-test.rb
 
 %files
 %defattr(-,root,root,-)
@@ -261,6 +249,9 @@ rm -rf %{buildroot}
 %{geminstdir}/test/
 
 %changelog
+* Wed Feb  9 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.90.7-2
+- 0.90.7
+
 * Sun Oct 31 2010 Mamoru Taska  <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.90.5-2
 - 0.90.5
 - Move C extension so that "require %%gemname" works correctly
diff --git a/sources b/sources
index adabcfe..7903a01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e39411da2ced845bb12a309c8908645  pango-0.90.5.gem
+104f45cb25ba962a0f22c0c3ebd57d1a  pango-0.90.7.gem