rpms/xpdf/FC-6 xpdf-3.02-fontlist.patch,NONE,1.1 xpdf.spec,1.4,1.5

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/xpdf/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19812/FC-6

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.02-fontlist.patch 
Log Message:

Fix bz 250709 and 250707 (thanks to Michal Jaegermann)


xpdf-3.02-fontlist.patch:

--- NEW FILE xpdf-3.02-fontlist.patch ---
--- xpdf-3.02/xpdf/XPDFApp.cc.fntlist	2007-02-27 15:05:52.000000000 -0700
+++ xpdf-3.02/xpdf/XPDFApp.cc	2007-08-02 20:39:26.000000000 -0600
@@ -35,9 +35,9 @@
 //------------------------------------------------------------------------
 
 static String fallbackResources[] = {
-  "*.zoomComboBox*fontList: -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1",
-  "*XmTextField.fontList: -*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1",
-  "*.fontList: -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1",
+  "*.zoomComboBox*fontList: -*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-1",
+  "*XmTextField.fontList: -*-courier-medium-r-*-12-*-*-*-*-*-iso8859-1",
+  "*.fontList: -*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-1",
   "*XmTextField.translations: #override\\n"
   "  Ctrl<Key>a:beginning-of-line()\\n"
   "  Ctrl<Key>b:backward-character()\\n"
--- xpdf-3.02/xpdf/XPDFViewer.cc.fntlist	2007-08-02 20:25:21.000000000 -0600
+++ xpdf-3.02/xpdf/XPDFViewer.cc	2007-08-02 20:38:03.000000000 -0600
@@ -2789,11 +2789,11 @@ void XPDFViewer::initAboutDialog() {
 
   //----- fonts
   aboutBigFont =
-    createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1");
+    createFontList("-*-times-bold-i-normal-*-20-*-*-*-*-*-iso8859-1");
   aboutVersionFont =
-    createFontList("-*-times-medium-r-normal--14-*-*-*-*-*-iso8859-1");
+    createFontList("-*-times-medium-r-normal-*-14-*-*-*-*-*-iso8859-1");
   aboutFixedFont =
-    createFontList("-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1");
+    createFontList("-*-courier-medium-r-*-12-*-*-*-*-*-iso8859-1");
 
   //----- heading
   n = 0;


Index: xpdf.spec
===================================================================
RCS file: /cvs/extras/rpms/xpdf/FC-6/xpdf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xpdf.spec	1 Aug 2007 22:01:10 -0000	1.4
+++ xpdf.spec	6 Aug 2007 20:00:42 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A PDF file viewer for the X Window System
 Name: xpdf
 Version: 3.02
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -42,6 +42,7 @@
 # Patch13: xpdf-3.01-resize.patch
 # Patch14: xpdf-3.01-freetype-internals.patch
 Patch15: xpdf-3.01-nocmap.patch
+Patch16: xpdf-3.02-fontlist.patch
 
 # Security patches
 Patch100: xpdf-3.02pl1.patch
@@ -85,7 +86,8 @@
 # Upstreamed
 #%%patch13 -p1 -b .resize
 #%%patch14 -p1 -b .freetype-internals
-%patch15 -p1 -b .nocmap
+%patch15 -p1
+%patch16 -p1 -b .fontlist
 
 # security patches
 %patch100 -p1 -b .security
@@ -100,6 +102,7 @@
 # Same action for _datadir.
 for file in xpdf-*/README xpdf-*/add-to-xpdfrc; do
   sed -i -e 's:/usr/share/:%{_datadir}/:g' $file
+  sed -i -e 's:/usr/local/share/:%{_datadir}/:g' $file
 done
 
 %configure \
@@ -177,6 +180,15 @@
      mv $RPM_BUILD_ROOT%{_datadir}/%{name}/$i/add-to-xpdfrc $RPM_BUILD_ROOT%{_sysconfdir}/xpdf/add-to-xpdfrc.$i
 done
 
+# xpdfrc cleanup
+sed -i -e 's:/usr/local/share/:%{_datadir}/:g' $RPM_BUILD_ROOT%{_sysconfdir}/xpdfrc
+
+# CJK are already in the file
+for i in arabic cyrillic greek hebrew latin2 thai turkish; do
+    echo "# $i" >> $RPM_BUILD_ROOT%{_sysconfdir}/xpdfrc
+    echo "include %{_sysconfdir}/xpdf/add-to-xpdfrc.$i" >> $RPM_BUILD_ROOT%{_sysconfdir}/xpdfrc
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -225,6 +237,10 @@
 %{_datadir}/xpdf/latin2
 
 %changelog
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.02-2
+- fix font list parsing to squelch noise (bz 250709)
+- cleanup add-to-xpdfrc files, update xpdfrc to include them by default
+
 * Wed Aug  1 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.02-1
 - bump to 3.02
 - patch in security fix