[rubygem-pango] - 0.90.5 - Move C extension so that "require %gemname" works correctly

[Mamoru Tasaka]

commit 3063f81e11cc3b5a9976338513fbf5b83fc3680d
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Oct 31 04:24:07 2010 +0900

    - 0.90.5
    - Move C extension so that "require %gemname" works correctly

 .gitignore         |    1 +
 rubygem-pango.spec |   31 ++++++++++++++++++++-----------
 sources            |    2 +-
 3 files changed, 22 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ec77436..0abe1a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /pango-0.90.2.gem
 /pango-0.90.3.gem
 /pango-0.90.4.gem
+/pango-0.90.5.gem
diff --git a/rubygem-pango.spec b/rubygem-pango.spec
index 9c07c09..294c80b 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.4
-%global	obsoleteevr	0.90.4-1.999
+%global	glibminver	0.90.5
+%global	obsoleteevr	0.90.5-1.999
 
 %global	rubyabi	1.8
 
 Summary:	Ruby binding of pango-1.x
 Name:		rubygem-%{gemname}
-Version:	0.90.4
+Version:	0.90.5
 Release:	2%{?dist}
 Group:		Development/Languages
 # from README
@@ -77,8 +77,8 @@ rubygem-%{gemname}
 %setup -q -c -T
 mkdir -p .%{gemdir}
 
-export pkgconfigdir=$(pwd)%{_libdir}/pkgconfig
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
 gem install \
 	-V \
 	--local \
@@ -101,6 +101,14 @@ find sample/ -name \*.rb | xargs chmod 0644
 popd
 
 %build
+# Move C extension library to some private directory
+pushd .%{geminstdir}
+mkdir lib/ruby-gnome2
+mv lib/%{gemname}.so lib/ruby-gnome2/
+grep -rl '%{gemname}.so' . | \
+	xargs sed -i \
+		-e "\@require at s|'%{gemname}.so'|'ruby-gnome2/%{gemname}.so'|" \
+		-e '\@require at s|"%{gemname}.so"|"ruby-gnome2/%{gemname}.so"|'
 
 %install
 rm -rf %{buildroot}
@@ -112,9 +120,9 @@ cp -a .%{gemdir}/* \
 
 pushd %{buildroot}
 # move header files, C extension files to the correct directory
-mkdir -p .%{ruby_sitearch}
+mkdir -p .%{ruby_sitearch}/ruby-gnome2/
 mv .%{geminstdir}/lib/*.h .%{ruby_sitearch}/
-mv .%{geminstdir}/lib/%{gemname}.so .%{ruby_sitearch}/
+mv .%{geminstdir}/lib/ruby-gnome2/%{gemname}.so .%{ruby_sitearch}/ruby-gnome2/
 popd
 
 # move pkgconfig file
@@ -202,14 +210,10 @@ 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
@@ -232,7 +236,8 @@ rm -rf %{buildroot}
 %exclude	%{geminstdir}/Rakefile
 
 %{geminstdir}/lib/%{gemname}.rb
-%{ruby_sitearch}/%{gemname}.so
+# %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2
+%{ruby_sitearch}/ruby-gnome2/%{gemname}.so
 
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
@@ -255,6 +260,10 @@ rm -rf %{buildroot}
 %{geminstdir}/test/
 
 %changelog
+* Sun Oct 31 2010 Mamoru Taska  <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.5-2
+- 0.90.5
+- Move C extension so that "require %%gemname" works correctly
+
 * Sun Oct 24 2010 Mamoru Taska  <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.4-2
 - 0.90.4
 
diff --git a/sources b/sources
index 686c5f7..adabcfe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a6ea6704ee0ba0c975def1cd4eb9acf  pango-0.90.4.gem
+5e39411da2ced845bb12a309c8908645  pango-0.90.5.gem