rpms/texlive/devel texlive.spec,1.55,1.56

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/texlive/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv610

Modified Files:
	texlive.spec 
Log Message:
- don't complain if the pdvipsk hunks touching config.ps don't apply



Index: texlive.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- texlive.spec	16 Oct 2009 05:36:21 -0000	1.55
+++ texlive.spec	16 Oct 2009 17:04:24 -0000	1.56
@@ -125,7 +125,6 @@ Patch1004:	texlive-2007-jp-platex209.pat
 Patch1005:	texlive-2007-pdvips.patch
 Patch1006:	texlive-2007-ptex-3.1.10.patch
 Patch1007:	texlive-2007-fmtutil-ptex.patch
-Patch1008:	texlive-poolfix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -459,15 +458,13 @@ cp -lR texk/dvipsk texk/pdvipsk
 cd pdvipsk
 %patch1005 -p0
 cd -
-patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch
+patch -d texk/pdvipsk -p1 < pdvipsk/dvipsk-%{pdvipsk_ver}.patch || :
 %patch1000 -p1 -b .pdvips
 ln -s dvips.1 texk/pdvipsk/pdvips.1
 
 # set up mendexk
 tar xfz %{SOURCE1002} -C texk
 
-%patch1008 -p1 -b .poolfix
-
 %build
 set -x
 # define CCACHE_DIR to let the build pass with ccache enabled.
@@ -1246,6 +1243,7 @@ fi
 - fix dvips configuration (#467542)
 - update kpathsea description and summary (#519257)
 - use upstream patch to fix pool overflow CVE-2009-1284 (#492136)
+- don't complain if the pdvipsk hunks touching config.ps don't apply
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007-44
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild