F-21: rebuild for ruby 2.1 / rubygems 2.2

rubygem-pango.spec

@@ -9,7 +9,7 @@
 Summary:	Ruby binding of pango-1.x
 Name:		rubygem-%{gem_name}
 Version:	2.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Development/Languages
 # from README
 License:	LGPLv2
@@ -27,8 +27,6 @@ BuildRequires:	pango-devel
 # %%check
 BuildRequires:	rubygem(test-unit)
 Requires:	rubygems
-Requires:	rubygem(cairo)
-Requires:	rubygem(glib2) >= %{glibminver}
 Provides:	rubygem(%{gem_name}) = %{version}
 
 Obsoletes:	ruby-%{gem_name} = %{version}-%{release}
@@ -91,13 +89,14 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
 	%{buildroot}%{gem_dir}/
 
-pushd %{buildroot}
 # move header files, C extension files to the correct directory
-mkdir -p .%{header_dir}
-mv .%{gem_instdir}/lib/*.h .%{header_dir}/
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a ./%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
 
-mkdir -p .%{gem_extdir_mri}/lib
-mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir_mri}/lib
+pushd %{buildroot}
+mkdir -p .%{header_dir}
+mv .%{gem_extdir_mri}/*.h .%{header_dir}/
+rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log}
 popd
 
 # move pkgconfig file
@@ -125,7 +124,7 @@ popd
 
 # test_default(TestLanguage) [./test/test-language.rb] needs LANG=ja_JP.UTF-8, for example
 LANG=en_US.UTF-8
-ruby -Ilib:test ./test/run-test.rb
+ruby -Ilib:test:ext/%{gem_name} ./test/run-test.rb
 
 %files
 %defattr(-,root,root,-)
@@ -136,9 +135,7 @@ ruby -Ilib:test ./test/run-test.rb
 %exclude	%{gem_instdir}/Rakefile
 
 %{gem_instdir}/lib/%{gem_name}.rb
-%dir	%{gem_extdir_mri}
-%dir	%{gem_extdir_mri}/lib
-%{gem_extdir_mri}/lib/%{gem_name}.so
+%{gem_extdir_mri}
 
 %exclude	%{gem_cache}
 %{gem_spec}
@@ -158,6 +155,9 @@ ruby -Ilib:test ./test/run-test.rb
 %{gem_instdir}/test/
 
 %changelog
+* Wed Apr 16 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-2
+- F-21: rebuild for ruby 2.1 / rubygems 2.2
+
 * Fri Apr 11 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.0-1
 - 2.2.0