- 0.90.3

.gitignore

@@ -1 +1,2 @@
 /pango-0.90.2.gem
+/pango-0.90.3.gem

rubygem-pango-0.90.2-enable-testsuite.patch

@@ -1,29 +0,0 @@
---- pango-0.90.2/test/run-test.rb.debug	1970-01-01 09:00:00.000000000 +0900
-+++ pango-0.90.2/test/run-test.rb	2010-09-28 06:40:38.000000000 +0900
-@@ -1,5 +1,17 @@
- #!/usr/bin/env ruby
- 
-+require 'rubygems'
-+gem 'test-unit'
-+require 'test/unit'
-+
-+$LOAD_PATH.unshift(File.dirname(__FILE__), "..", "lib")
-+$LOAD_PATH.unshift(File.dirname(__FILE__))
-+begin
-+  gem "cairo"
-+  gem "glib2"
-+rescue LoadError
-+end
-+
- $VERBOSE = true
- 
- ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
-@@ -9,7 +21,7 @@
- pango_base = File.join(ruby_gnome2_base, "pango")
- 
- $LOAD_PATH.unshift(File.join(glib_base, "test"))
--require 'glib-test-init'
-+#require 'glib-test-init'
- 
- [[glib_base, "glib2"],
-  [pango_base, "pango"]].each do |target, module_name|

rubygem-pango.spec

@@ -5,31 +5,32 @@
 %global	gemname	pango
 %global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}
 
+%global	glibminver	0.90.3
+%global	obsoleteevr	0.90.3-1.999
+
 %global	rubyabi	1.8
 
 Summary:	Ruby binding of pango-1.x
 Name:		rubygem-%{gemname}
-Version:	0.90.2
-Release:	5%{?dist}
+Version:	0.90.3
+Release:	2%{?dist}
 Group:		Development/Languages
 # from README
 License:	LGPLv2
 URL:		http://ruby-gnome2.sourceforge.jp/
 Source0:	http://rubygems.org/gems/%{gemname}-%{version}.gem
-# Need to contact upstream?
-Patch0:	rubygem-pango-0.90.2-enable-testsuite.patch
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygems
 BuildRequires:	rubygem-cairo-devel
-BuildRequires:	rubygem-glib2-devel
+BuildRequires:	rubygem-glib2-devel >= %{glibminver}
 BuildRequires:	ruby-devel
 BuildRequires:	pango-devel
 BuildRequires(check):	rubygem(test-unit)
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	rubygems
 Requires:	rubygem(cairo)
-Requires:	rubygem(glib2) = %{version}
+Requires:	rubygem(glib2) >= %{glibminver}
 Provides:	rubygem(%{gemname}) = %{version}
 
 %description
@@ -64,7 +65,7 @@ Requires:	pango-devel
 Requires:	rubygem-cairo-devel
 # Obsoletes / Provides
 # ruby(%%{gemname}-devel) Provides is for compatibility
-Obsoletes:	ruby-%{gemname}-devel < 0.90.2-3.999
+Obsoletes:	ruby-%{gemname}-devel < %{obsoleteevr}
 Provides:	ruby-%{gemname}-devel = %{version}-%{release}
 Provides:	ruby(%{gemname}-devel) = %{version}-%{release}
 
@@ -76,7 +77,7 @@ rubygem-%{gemname}
 %setup -q -c -T
 mkdir -p .%{gemdir}
 
-export DESTDIR=$(pwd)/TMPINSTDIR
+export pkgconfigdir=$(pwd)%{_libdir}/pkgconfig
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 gem install \
 	-V \
@@ -88,11 +89,6 @@ gem install \
 
 find . -name \*.gem | xargs chmod 0644
 
-# patch
-pushd .%{geminstdir}
-%patch0 -p1 -b .debug
-popd
-
 pushd .%{geminstdir}
 # Fix wrong shebang
 grep -rl /usr/local/bin sample | \
@@ -123,7 +119,7 @@ popd
 
 # move pkgconfig file
 mkdir %{buildroot}%{_libdir}/pkgconfig
-install -cpm 644 TMPINSTDIR/%{_libdir}/pkgconfig/*.pc \
+install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \
 	%{buildroot}%{_libdir}/pkgconfig/
 
 
@@ -205,6 +201,21 @@ 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"))
+\$LOAD_PATH.unshift(File.join(File.dirname(__FILE__)))
+
+begin
+	require 'rubygems'
+	gem 'cairo'
+	gem 'glib2'
+	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
@@ -244,6 +255,9 @@ rm -rf %{buildroot}
 %{geminstdir}/test/
 
 %changelog
+* Sun Oct 24 2010 Mamoru Taska  <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.90.3-2
+- 0.90.3
+
 * Fri Oct  1 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.90.2-5
 - Fix up summary
 - Fix Requires for -devel subpackage

sources

@@ -1 +1 @@
-5c63671ab8d9e7ccbce5050ec6c76f46  pango-0.90.2.gem
+8fd29b854e5027ceb01e67212d9d9587  pango-0.90.3.gem