rpms/texlive/devel texlive.spec,1.16,1.17

[Jindrich Novy (jnovy)]

Author: jnovy

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

Modified Files:
	texlive.spec 
Log Message:
temporary fix to pdflatex to not to warn verbosely because of ambiguous entries in pdflatex.map (#425804)



Index: texlive.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive/devel/texlive.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- texlive.spec	15 Jan 2008 13:37:53 -0000	1.16
+++ texlive.spec	16 Jan 2008 13:03:03 -0000	1.17
@@ -26,7 +26,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -39,7 +39,6 @@
 #Source0:	http://tug.org/svn/texlive/branches/branch2007/Master/source/source.tar.bz2
 # non free source files removed with texlive-generate-tarball.sh
 Source0:	source-free.tar.bz2
-#Source1:	xpdf-3.02.tar.bz2
 
 Source10:	texlive.cron
 # Filter out bad requirements (RH bug #59819).
@@ -358,12 +357,6 @@
 %prep
 %setup -q -T -c -a0
 
-# replace old xpdf with 3.02 from upstream to fix CVE-2007-3387
-#pushd libs
-#rm -rf xpdf
-#tar fxj %{SOURCE1}
-#popd
-
 # fix for debuginfo rpmlint happiness
 chmod -x texk/dvipdfm/macglyphs.h
 chmod -x texk/dvipdfm/ttf.c
@@ -686,26 +679,31 @@
 rm -rf %{buildroot}
 
 %post
-%{_bindir}/texconfig-sys rehash 2> /dev/null || :
-[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/web2c.info.gz %{_infodir}/dir || :
-%{_bindir}/fmtutil-sys --all > /dev/null 2>&1 || :
-%{_bindir}/updmap-sys --syncwithtrees > /dev/null 2>&1 || :
+%{_bindir}/texconfig-sys rehash 2> /dev/null
+[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/web2c.info.gz %{_infodir}/dir
+%{_bindir}/fmtutil-sys --all &> /dev/null
+%{_bindir}/updmap-sys --syncwithtrees &> /dev/null
+cp -f %{_texmf_main}/fonts/map/pdftex/updmap/pdftex_* %{_texmf_var}/fonts/map/pdftex/updmap/
+:
 
 %post afm
 %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
 %post dvips
-[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvips.info.gz %{_infodir}/dir || :
-%{_bindir}/texconfig-sys rehash 2> /dev/null || :
+[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/dvips.info.gz %{_infodir}/dir
+%{_bindir}/texconfig-sys rehash 2> /dev/null
+:
 
 %post dviutils
 %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
 %post latex
-[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/latex.info.gz %{_infodir}/dir || :
-%{_bindir}/texconfig-sys init >/dev/null 2>&1 || :
-%{_bindir}/texconfig-sys rehash 2> /dev/null || :
-%{_bindir}/fmtutil-sys --all > /dev/null 2>&1 || :
+[ -x /sbin/install-info ] && /sbin/install-info %{_infodir}/latex.info.gz %{_infodir}/dir
+%{_bindir}/texconfig-sys init &> /dev/null
+%{_bindir}/texconfig-sys rehash 2> /dev/null
+%{_bindir}/fmtutil-sys --all &> /dev/null
+cp -f %{_texmf_main}/fonts/map/pdftex/updmap/pdftex_* %{_texmf_var}/fonts/map/pdftex/updmap/
+:
 
 %post -n kpathsea
 /sbin/ldconfig
@@ -1068,12 +1066,8 @@
 
 %files dviutils
 %defattr(-,root,root,-)
-# separated project (dvi2tty)
-#%{_bindir}/disdvi
 %{_bindir}/dt2dv
 %{_bindir}/dv2dt
-# separated project (dvi2tty)
-#%{_bindir}/dvi2tty
 %{_bindir}/dvicopy
 %{_bindir}/dvihp
 %{_bindir}/dvitype
@@ -1095,8 +1089,6 @@
 %{_mandir}/man1/dvitype.1*
 %{_mandir}/man1/dt2dv.1*
 %{_mandir}/man1/dv2dt.1*
-# separated project (dvi2tty)
-#%{_mandir}/man1/dvi2tty.1*
 %{_mandir}/man1/dvibook.1*
 %{_mandir}/man1/dviconcat.1*
 %{_mandir}/man1/dvidvi.1*
@@ -1203,6 +1195,11 @@
 %{_texmf_main}/dvipdfm/
 
 %changelog
+* Wed Jan 16 2008 Jindrich Novy <jnovy at redhat.com> - 2007-11
+- temporary fix to pdflatex to not to warn verbosely because of
+  ambiguous entries in pdflatex.map (#425804)
+- update post scriptlets, spec cleanup
+
 * Tue Jan 15 2008 Jindrich Novy <jnovy at redhat.com> - 2007-10
 - don't build/package xdvik/pxdvik, it's now separated
 - fix texlive-doc requires, description