From 9e78240d8f0e48c595a3f24980597a70934099b9 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Mon, 26 Sep 2011 13:01:47 +0200
Subject: [PATCH] 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 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/poppler.spec b/poppler.spec
index b827dc6..d20637f 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@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)
+
 * Mon Sep 19 2011 Marek Kasik <mkasik@redhat.com> - 0.17.3-1
 - Update to 0.17.3