[poppler] omit g_thread_init from glib-demo (f17+)

[Rex Dieter]

commit de14136448a2114e193c63d89364397a2efc11f2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 28 11:18:07 2011 -0500

    omit g_thread_init from glib-demo (f17+)

 poppler-0.18.1-glib.patch |   13 +++++++++++++
 poppler.spec              |    8 +++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/poppler-0.18.1-glib.patch b/poppler-0.18.1-glib.patch
new file mode 100644
index 0000000..797e1c2
--- /dev/null
+++ b/poppler-0.18.1-glib.patch
@@ -0,0 +1,13 @@
+diff -up poppler-0.18.1/glib/demo/main.c.glib poppler-0.18.1/glib/demo/main.c
+--- poppler-0.18.1/glib/demo/main.c.glib	2011-09-28 08:42:50.000000000 -0500
++++ poppler-0.18.1/glib/demo/main.c	2011-10-28 11:15:30.189241783 -0500
+@@ -300,9 +300,6 @@ gint main (gint argc, gchar **argv)
+ 		return 1;
+ 	}
+ 
+-	if (!g_thread_supported ())
+-		g_thread_init (NULL);
+-
+ 	gtk_init (&argc, &argv);
+ 
+ 	file = g_file_new_for_commandline_arg (argv[1]);
diff --git a/poppler.spec b/poppler.spec
index ae571b7..6546925 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -12,6 +12,8 @@ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 # http://bugzilla.redhat.com/show_bug.cgi?id=480868
 Patch1: poppler-0.12.4-annot-appearance.patch
 
+# poppler-glib-demo, drop extraneous g_thread_init
+Patch2: poppler-0.18.1-glib.patch
 
 Requires: poppler-data >= 0.4.0
 BuildRequires: automake libtool
@@ -119,7 +121,11 @@ converting PDF files to a number of other formats.
 %prep
 %setup -q
 
-#%patch1 -p1 -b .annot
+#patch1 -p1 -b .annot
+
+#if 0%{?fedora} > 16
+%patch2 -p1 -b .glib
+#endif
 
 chmod -x goo/GooTimer.h