rpms/xpdf/devel xpdf.spec,1.68,1.69

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15429

Modified Files:
	xpdf.spec 
Log Message:
- remove pdf command-line utilities and require poppler ones
  instead (bug 177446).



Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- xpdf.spec	18 Jan 2006 17:52:08 -0000	1.68
+++ xpdf.spec	18 Jan 2006 18:15:08 -0000	1.69
@@ -7,7 +7,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 8
+Release: 9
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -39,6 +39,7 @@
 
 Requires: urw-fonts
 Requires: htmlview
+Requires: poppler-utils >= 0.5.0-4
 
 BuildPrereq: openmotif-devel
 BuildPrereq: freetype-devel >= 2.1.7
@@ -75,11 +76,6 @@
 Requires: %{name} >= 1.00
 Group: Applications/Publishing
 
-%package utils
-Summary: Command line utilities for converting PDF files.
-Group: Applications/Text
-Requires: %name = %{version}
-
 %description
 Xpdf is an X Window System based viewer for Portable Document Format
 (PDF) files. Xpdf is a small and efficient program which uses
@@ -113,10 +109,6 @@
 Contents include: Adobe-Korea1 character collection support and
 KSX1001 encoding
 
-%description utils
-This utils package installs a number of command line tools for
-converting PDF files to a number of other formats
-
 %prep
 %setup -q -a 1 -a 3 -a 4 -a 5 -a 6
 %patch -p1
@@ -188,6 +180,22 @@
 cp -rf xpdf-japanese/* $RPM_BUILD_ROOT%{_datadir}/xpdf/japanese/
 cp -rf xpdf-korean/* $RPM_BUILD_ROOT%{_datadir}/xpdf/korean/
 
+# poppler provides these utilities now
+# http://bugzilla.redhat.com/bugzillA/SHow_bug.cgi?id=177446
+rm -rf $RPM_BUILD_ROOT%{_bindir}/pdffonts
+rm -rf $RPM_BUILD_ROOT%{_bindir}/pdfimages
+rm -rf $RPM_BUILD_ROOT%{_bindir}/pdfinfo
+rm -rf $RPM_BUILD_ROOT%{_bindir}/pdftohtml
+rm -rf $RPM_BUILD_ROOT%{_bindir}/pdftops
+rm -rf $RPM_BUILD_ROOT%{_bindir}/pdftotext
+
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdffonts.1*
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdfimages.1*
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdfinfo.1*
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdftohtml.1*
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdftops.1*
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdftotext.1*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -229,12 +237,11 @@
 %endif
 %lang(ko) %{_datadir}/xpdf/korean
 
-%files utils
-%defattr(-, root, root)
-%{_bindir}/pdf*
-%{_mandir}/man1/pdf*
-
 %changelog
+* Wed Jan 18 2006 Ray Strode <rstrode at redhat.de> 3.01-9
+- remove pdf command-line utilities and require poppler ones
+  instead (bug 177446).
+
 * Wed Jan 18 2006 Than Ngo <than at redhat.com> 3.01-8
 - add new subpackage xpdf-utils