[rubygem-poppler] 2.1.0

[Mamoru TASAKA]

commit 373df86869f2d74b77da5183e76673c28c9ee3d8
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Thu Jan 16 23:04:25 2014 +0900

    2.1.0

 .gitignore           |    1 +
 rubygem-poppler.spec |   41 +++++++++++++++++++++++------------------
 sources              |    2 +-
 3 files changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d9cdf8..32c3f52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /poppler-1.2.5.gem
 /poppler-1.2.6.gem
 /poppler-2.0.2.gem
+/poppler-2.1.0.gem
diff --git a/rubygem-poppler.spec b/rubygem-poppler.spec
index d18e24b..f17683e 100644
--- a/rubygem-poppler.spec
+++ b/rubygem-poppler.spec
@@ -2,12 +2,12 @@
 
 %global	gem_name	poppler
 
-%global	glibminver	2.0.0
+%global	glibminver	2.1.0
 %global	obsoleteevr	0.90.7-1.999
 
 Summary:	Ruby binding of poppler-glib
 Name:		rubygem-%{gem_name}
-Version:	2.0.2
+Version:	2.1.0
 Release:	1%{?dist}
 Group:		Development/Languages
 # from README
@@ -68,16 +68,8 @@ Header files and libraries for building a extension library for the
 rubygem-%{gem_name}
 
 %prep
-%setup -q -c -T
-mkdir -p .%{gem_dir}
-
-export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
-%gem_install -n %{SOURCE0}
-
-find . -name \*.gem | xargs chmod 0644
-
-pushd .%{gem_instdir}
+gem unpack %{SOURCE0}
+%setup -q -D -T -n  %{gem_name}-%{version}
 
 # Omit tests failing without net
 %patch2 -p1
@@ -90,11 +82,16 @@ pushd .%{gem_instdir}
 grep -rl '#!.*/usr/bin' sample | \
 	xargs sed -i -e '\@#![ ]*/usr/bin at d'
 find sample/ -name \*.rb | xargs chmod 0644
-popd
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+
+# Allow ruby-gnome2 no less than ones
+sed -i -e 's|= 2\.1\.0|>= 2.1.0|' %{gem_name}.gemspec
 
 %build
-# Move C extension library to some private directory
-pushd .%{gem_instdir}
+export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
+gem build %{gem_name}.gemspec
+%gem_install
 
 %install
 # Once copy all
@@ -136,7 +133,12 @@ ln -sf /bin/true make
 export PATH=$(pwd):$PATH
 popd
 
-ruby -Itest ./test/run-test.rb || echo "Investigate this later"
+sed -i.skip_make -e 's|which make|which nomake|' ./test/run-test.rb
+
+# test_render fails
+ruby -Itest ./test/run-test.rb || ruby -Itest ./test/run-test.rb -x test_page.rb
+
+mv test/run-test.rb{.skip_make,}
 
 %files
 %defattr(-,root,root,-)
@@ -151,7 +153,7 @@ ruby -Itest ./test/run-test.rb || echo "Investigate this later"
 %dir	%{gem_extdir_mri}/lib
 %{gem_extdir_mri}/lib/%{gem_name}.so
 
-%{gem_cache}
+%exclude	%{gem_cache}
 %{gem_spec}
 
 %files	devel
@@ -161,11 +163,14 @@ ruby -Itest ./test/run-test.rb || echo "Investigate this later"
 %files	doc
 %defattr(-,root,root,-)
 %{gem_docdir}/
-%{gem_instdir}/Rakefile
+%exclude	%{gem_instdir}/Rakefile
 %{gem_instdir}/sample/
 %{gem_instdir}/test/
 
 %changelog
+* Thu Jan 16 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.1.0-1
+- 2.1.0
+
 * Fri Aug 16 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.0.2-1
 - 2.0.2
 
diff --git a/sources b/sources
index 206952f..183381a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e47afe505883f1afba6a2633ff20506  poppler-2.0.2.gem
+24fbfb53cecb0df20586501b22c8b72f  poppler-2.1.0.gem