[poppler/f16] Update to 0.18.0 (stable)

[mkasik]

commit bd2573250d0ec602908788d5cae7007dfd1cc5c8
Author: Marek Kasik <mkasik at redhat.com>
Date:   Mon Oct 3 11:59:23 2011 +0200

    Update to 0.18.0 (stable)

 .gitignore   |    1 +
 poppler.spec |   15 ++++++++-------
 sources      |    2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d3abafc..6d67c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /poppler-0.16.7.tar.gz
 /poppler-0.17.0.tar.gz
 /poppler-0.17.3.tar.gz
+/poppler-0.18.0.tar.gz
diff --git a/poppler.spec b/poppler.spec
index 472fb61..f6fd951 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
+* Mon Oct  3 2011 Marek Kasik <mkasik at redhat.com> - 0.18.0-1
+- Update to 0.18.0 (stable)
+
 * Mon Sep 26 2011 Marek Kasik <mkasik at 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)
diff --git a/sources b/sources
index 0100d4f..6500020 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ccdedfdbfa507ebaca5c2e23d87fcbee  poppler-0.17.3.tar.gz
+4cd3bf2a0a13fa8eaf00d31368915f77  poppler-0.18.0.tar.gz