rpms/t1lib/devel t1lib-5.1.1-findchk.patch, NONE, 1.1 t1lib.spec, 1.18, 1.19

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	t1lib.spec 
Added Files:
	t1lib-5.1.1-findchk.patch 
Log Message:
* Sat Jan  5 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-5
- silence t1libconfig when the directories don't exist (#183108)


t1lib-5.1.1-findchk.patch:

--- NEW FILE t1lib-5.1.1-findchk.patch ---
diff -up t1lib-5.1.1/debian/t1libconfig.findchk t1lib-5.1.1/debian/t1libconfig
--- t1lib-5.1.1/debian/t1libconfig.findchk	2008-01-06 00:39:25.000000000 +0100
+++ t1lib-5.1.1/debian/t1libconfig	2008-01-06 00:44:31.000000000 +0100
@@ -44,8 +44,14 @@ EOF
 }
 
 version=0.2
-x11fontdirs=$(find /usr/share/X11/fonts -type d -printf "%p " || true)
-fontdirs="/usr/lib/ghostscript/fonts $x11fontdirs"
+topfontdirs="/usr/share/X11/fonts"
+for dir in $topfontdirs; do
+   if [ -d $dir ]; then
+       fontdir=`find $dir -type d -printf "%p "`
+       fontdirs="$fontdir $fontdirs"
+   fi
+done
+fontdirs="/usr/lib/ghostscript/fonts $fontdirs"
 conffile=/etc/t1lib/t1lib.config
 confdir=/etc/t1lib/
 dbase=/etc/t1lib/FontDatabase


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- t1lib.spec	5 Jan 2008 22:51:45 -0000	1.18
+++ t1lib.spec	6 Jan 2008 00:01:24 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -15,6 +15,7 @@
 Patch3:         t1lib-5.0.0-t1libconfig.patch
 Patch4:         t1lib-cve-2007-4033.patch
 Patch5:         t1lib-5.1.1-segf.patch
+Patch6:         t1lib-5.1.1-findchk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): coreutils, findutils
@@ -51,6 +52,8 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1 -b .segf
+%patch6 -p1 -b .findchk
+
 iconv -f latin1 -t utf8 < Changes > Changes.utf8
 touch -r Changes Changes.utf8
 mv Changes.utf8 Changes
@@ -123,6 +126,9 @@
 
 
 %changelog
+* Sat Jan  5 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-5
+- silence t1libconfig when the directories don't exist (#183108)
+
 * Sat Jan  5 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-4
 - separate subpackage for static library
 - keep timestamps