[ruby-gnome2] - Use upstream patch for poppler 0.15.0 issue

[Mamoru Tasaka]

commit 38db5e4c90403577e6bf497a4a0d32e01f57cb88
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Oct 4 01:41:18 2010 +0900

    - Use upstream patch for poppler 0.15.0 issue

 ruby-gnome2-0.90.2-poppler-0_15_0.patch |   47 ++++++++++++++++++++----------
 ruby-gnome2.spec                        |    7 +++-
 2 files changed, 36 insertions(+), 18 deletions(-)
---
diff --git a/ruby-gnome2-0.90.2-poppler-0_15_0.patch b/ruby-gnome2-0.90.2-poppler-0_15_0.patch
index df78fcd..82c098e 100644
--- a/ruby-gnome2-0.90.2-poppler-0_15_0.patch
+++ b/ruby-gnome2-0.90.2-poppler-0_15_0.patch
@@ -1,26 +1,41 @@
---- ruby-gnome2-all-0.90.2/poppler/ext/poppler/rbpoppler-page.c.debug	2010-09-23 09:43:13.000000000 +0900
-+++ ruby-gnome2-all-0.90.2/poppler/ext/poppler/rbpoppler-page.c	2010-10-02 05:20:24.000000000 +0900
-@@ -340,11 +340,21 @@
-         poppler_page_get_size(page, &width, &height);
-         rect.x2 = width;
-         rect.y2 = height;
--        text = poppler_page_get_text(page,
+------------------------------------------------------------------------
+r3942 | ktou | 2010-10-03 21:30:52 +0900 (Sun, 03 Oct 2010) | 3 lines
+
+* ext/poppler/rbpoppler-page.c: support Poppler 0.15.0. [#3079667]
+  Reported by Mamoru Tasaka. Thanks!!!
+
+------------------------------------------------------------------------
+Index: poppler/ext/poppler/rbpoppler-page.c
+===================================================================
+--- poppler/ext/poppler/rbpoppler-page.c	(revision 3941)
++++ poppler/ext/poppler/rbpoppler-page.c	(revision 3942)
+@@ -332,6 +332,9 @@
+     }
+ 
+     if (NIL_P(rb_rect)) {
 +#if POPPLER_CHECK_VERSION(0, 15, 0)
-+        text = poppler_page_get_selected_text(
++        text = poppler_page_get_text(page);
 +#else
-+        text = poppler_page_get_text(
-+#endif
-+                                     page,
+         PopplerRectangle rect;
+         double width, height;
+ 
+@@ -343,10 +346,16 @@
+         text = poppler_page_get_text(page,
                                       style,
                                       &rect);
++#endif
      } else {
 -        text = poppler_page_get_text(page,
+-                                     style,
+-                                     RVAL2POPPLER_RECT(rb_rect));
++        PopplerRectangle *rect;
++
++	rect = RVAL2POPPLER_RECT(rb_rect);
 +#if POPPLER_CHECK_VERSION(0, 15, 0)
-+        text = poppler_page_get_selected_text(
++        text = poppler_page_get_selected_text(page, style, rect);
 +#else
-+        text = poppler_page_get_text(
++        text = poppler_page_get_text(page, style, rect);
 +#endif
-+                                     page,
-                                      style,
-                                      RVAL2POPPLER_RECT(rb_rect));
      }
+ 
+     rb_text = CSTR2RVAL(text);
diff --git a/ruby-gnome2.spec b/ruby-gnome2.spec
index a5f06f1..2772db9 100644
--- a/ruby-gnome2.spec
+++ b/ruby-gnome2.spec
@@ -9,7 +9,7 @@
 # the new EVR won't be higher than the one of higher branch!!
 #
 # Until gem switch ends, we will use non-integer release
-%define         mainrel                1.1
+%define         mainrel                1.2
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -771,7 +771,7 @@ This package provides libraries and header files for ruby-vte
 %setup -q -n %{name}-all-%{version}
 #%%setup -q -n %{name}-all-%{version}-%{betaver}
 
-%patch0 -p1 -b .newpoppler
+%patch0 -p0 -b .newpoppler
 
 # Fix /usr/local
 grep -rl /usr/local/bin . | grep -v ChangeLog | \
@@ -1098,6 +1098,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct  4 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.2-1.2
+- Use upstream patch for poppler 0.15.0 issue
+
 * Sat Oct  2 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.2-1.1
 - F-15: patch for poppler 0.15.0