spot pushed to xpdf (master). "RHEL 7 does not need pdfdetach"

[notifications at fedoraproject.org]

From efaabc01501cce0eb0f016443c8723af9b631a07 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Mon, 11 May 2015 11:58:43 +0200
Subject: RHEL 7 does not need pdfdetach


diff --git a/xpdf.spec b/xpdf.spec
index 1544fbe..464ab33 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.04
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPLv2 or GPLv3
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -173,7 +173,7 @@ cp -pr xpdf-turkish/* $RPM_BUILD_ROOT%{_datadir}/xpdf/turkish/
 # poppler provides all utilities now
 # http://bugzilla.redhat.com/bugzillA/SHow_bug.cgi?id=177446
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219032
-%if 0%{?fedora}
+%if 0%{?rhel} > 6 || 0%{?fedora}
 rm $RPM_BUILD_ROOT%{_bindir}/pdfdetach
 %endif
 rm $RPM_BUILD_ROOT%{_bindir}/pdffonts
@@ -185,7 +185,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/pdftotext
 rm $RPM_BUILD_ROOT%{_bindir}/pdftoppm
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftoppm.1*
 %endif
-%if 0%{?fedora}
+%if 0%{?rhel} > 6 || 0%{?fedora}
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdfdetach.1*
 %endif
 rm $RPM_BUILD_ROOT%{_mandir}/man1/pdffonts.1*
@@ -232,9 +232,11 @@ update-desktop-database &> /dev/null ||:
 %{_mandir}/man?/pdftoppm*
 %endif
 %if 0%{?rhel}
+%if 0%{?rhel} < 7
 %{_bindir}/pdfdetach
 %{_mandir}/man?/pdfdetach*
 %endif
+%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
@@ -265,6 +267,10 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/xpdf/latin2
 
 %changelog
+<<<<<<< HEAD
+* Mon May 11 2015 Tom Callaway <spot at fedoraproject.org> - 1:3.04-9
+- RHEL 7 does not need pdfdetach
+
 * Sat May 02 2015 Kalev Lember <kalevlember at gmail.com> - 1:3.04-8
 - Rebuilt for GCC 5 C++11 ABI change
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xpdf.git/commit/?h=master&id=efaabc01501cce0eb0f016443c8723af9b631a07