[xpdf] sync

[Tom Callaway]

commit b188a15c133f77731067c75cf7f938535e02ff51
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Fri Jan 21 13:44:41 2011 -0500

    sync

 xpdf.spec |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/xpdf.spec b/xpdf.spec
index 5ea7dcf..9c1ea0b 100644
--- a/xpdf.spec
+++ b/xpdf.spec
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -203,14 +203,15 @@ rm $RPM_BUILD_ROOT%{_bindir}/pdfimages
 rm $RPM_BUILD_ROOT%{_bindir}/pdfinfo
 rm $RPM_BUILD_ROOT%{_bindir}/pdftops
 rm $RPM_BUILD_ROOT%{_bindir}/pdftotext
+%if 0%{?rhel} > 5 || 0%{?fedora} > 6
 rm $RPM_BUILD_ROOT%{_bindir}/pdftoppm
-
+rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftoppm.1*
+%endif
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdffonts.1*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdfimages.1*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdfinfo.1*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftops.1*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftotext.1*
-rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftoppm.1*
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xpdf/
 for i in arabic chinese-simplified chinese-traditional cyrillic greek hebrew japanese korean latin2 thai turkish; do
@@ -245,6 +246,10 @@ update-desktop-database &> /dev/null ||:
 %doc CHANGES README README.*
 %{_bindir}/xpdf
 %{_mandir}/man?/xpdf*
+%if 0%{?rhel} < 6 || 0%{?fedora} < 7
+%{_bindir}/pdftoppm
+%{_mandir}/man?/pdftoppm*
+%endif
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdfrc
 %dir %{_sysconfdir}/xpdf
 %lang(ar) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.arabic
@@ -275,6 +280,10 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Fri Jan 21 2011 Tom Callaway <spot at fedoraproject.org> - 1:3.02-17
+- Added pdftoppm for el5 or older, since it is not included in poppler-utils on el5
+- Thanks to Ingvar Hagelund.
+
 * Fri Oct 22 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1:3.02-16
 - apply xpdf-3.02pl5 security patch to fix:
   CVE-2010-3702, CVS-2010-3704