[poppler/f16] Don't include pdfextract and pdfmerge

[mkasik]

commit c1a2d1a871e7136620358a7676ac13f2c6f9749a
Author: Marek Kasik <mkasik at redhat.com>
Date:   Mon Sep 26 13:16:01 2011 +0200

    Don't include pdfextract and pdfmerge
    
    Don't include pdfextract and pdfmerge in resulting packages for now
    since they conflict with packages pdfmerge and mupdf (#740906)

 poppler.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/poppler.spec b/poppler.spec
index 4e04c72..472fb61 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -2,7 +2,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.17.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
@@ -148,6 +148,8 @@ 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
@@ -218,6 +220,10 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %changelog
+* 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)
+
 * Tue Sep 20 2011 Marek Kasik <mkasik at redhat.com> - 0.17.3-1
 - Update to 0.17.3