From 124e4c1eac769987ab90edb4ec41e3a1899a332b Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Fri, 30 Sep 2011 09:16:43 +0200
Subject: [PATCH] Update to 0.18.0

---
 poppler.spec | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/poppler.spec b/poppler.spec
index d20637f..aca3020 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,8 +1,8 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.17.3
-Release: 2%{?dist}
+Version: 0.18.0
+Release: 1%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -148,8 +148,6 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -fv $RPM_BUILD_ROOT%{_bindir}/pdfextract
-rm -fv $RPM_BUILD_ROOT%{_bindir}/pdfmerge
 
 
 %post -p /sbin/ldconfig
@@ -172,7 +170,7 @@ rm -fv $RPM_BUILD_ROOT%{_bindir}/pdfmerge
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_libdir}/libpoppler.so.17*
+%{_libdir}/libpoppler.so.18*
 
 %files devel
 %defattr(-,root,root,-)
@@ -185,14 +183,14 @@ rm -fv $RPM_BUILD_ROOT%{_bindir}/pdfmerge
 %files glib
 %defattr(-,root,root,-)
 %{_libdir}/libpoppler-glib.so.8*
-%{_libdir}/girepository-1.0/Poppler-0.16.typelib
+%{_libdir}/girepository-1.0/Poppler-0.18.typelib
 
 %files glib-devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/poppler-glib.pc
 %{_libdir}/pkgconfig/poppler-cairo.pc
 %{_libdir}/libpoppler-glib.so
-%{_datadir}/gir-1.0/Poppler-0.16.gir
+%{_datadir}/gir-1.0/Poppler-0.18.gir
 
 %files qt
 %defattr(-,root,root,-)
@@ -220,6 +218,9 @@ rm -fv $RPM_BUILD_ROOT%{_bindir}/pdfmerge
 
 
 %changelog
+* Fri Sep 30 2011 Marek Kasik <mkasik@redhat.com> - 0.18.0-1
+- Update to 0.18.0
+
 * Mon Sep 26 2011 Marek Kasik <mkasik@redhat.com> - 0.17.3-2
 - Don't include pdfextract and pdfmerge in resulting packages for now
 - since they conflict with packages pdfmerge and mupdf (#740906)