rpms/xpdf/devel xpdf.spec,1.1,1.2

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/xpdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22838/devel

Modified Files:
	xpdf.spec 
Log Message:

Drop xpdf-utils, poppler-utils ate it all.



Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xpdf.spec	27 Sep 2006 17:12:58 -0000	1.1
+++ xpdf.spec	14 Dec 2006 21:17:08 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.01
-Release: 26%{?dist}
+Release: 27%{?dist}
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -63,20 +63,11 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%package utils
-Summary: Command line utilities for converting PDF files
-Group: Applications/Text
-Requires: poppler-utils >= 0.5.0-4
-
 %description
 Xpdf is an X Window System based viewer for Portable Document Format
 (PDF) files. Xpdf is a small and efficient program which uses
 standard X fonts.
 
-%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 3 -a 4 -a 5 -a 6 -a 7 -a 8
 %patch -p1
@@ -148,19 +139,22 @@
 cp -pr xpdf-korean/* $RPM_BUILD_ROOT%{_datadir}/xpdf/korean/
 cp -pr xpdf-thai/* $RPM_BUILD_ROOT%{_datadir}/xpdf/thai/
 
-# poppler provides these utilities now
+# 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
 rm $RPM_BUILD_ROOT%{_bindir}/pdffonts
 rm $RPM_BUILD_ROOT%{_bindir}/pdfimages
 rm $RPM_BUILD_ROOT%{_bindir}/pdfinfo
 rm $RPM_BUILD_ROOT%{_bindir}/pdftops
 rm $RPM_BUILD_ROOT%{_bindir}/pdftotext
+rm $RPM_BUILD_ROOT%{_bindir}/pdftoppm
 
 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 chinese-simplified chinese-traditional cyrillic japanese korean thai; do
@@ -205,12 +199,10 @@
 %lang(th) %{_datadir}/xpdf/thai
 %{_datadir}/xpdf/cyrillic
 
-%files utils
-%defattr(-, root, root)
-%{_bindir}/pdf*
-%{_mandir}/man?/pdf*
-
 %changelog
+* Thu Dec 14 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-27
+- drop the xpdf-utils subpackage, poppler-utils ate it all
+
 * Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-26
 - get rid of goo/vms_* since they have questionable licensing