rpms/texlive-texmf/F-11 texlive-2007-latin.patch, NONE, 1.1 texlive-filter-requires.sh, 1.2, 1.3 texlive-texmf.spec, 1.32, 1.33

Wed Oct 21 18:16:40 UTC 2009

Author: jnovy

Update of /cvs/pkgs/rpms/texlive-texmf/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9054

Modified Files:
	texlive-filter-requires.sh texlive-texmf.spec 
Added Files:
	texlive-2007-latin.patch 
Log Message:
* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
- do not conflict with dvipdfm
- update perl requires filter
- update latin.ldf (#469948)
- do not provide any perl dependencies (#516350)


texlive-2007-latin.patch:
 latin.ldf |  150 +++++++++++++++++++++-----------------------------------------
 1 file changed, 52 insertions(+), 98 deletions(-)

--- NEW FILE texlive-2007-latin.patch ---
diff -up texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf
--- texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf.latin	2006-08-27 20:22:43.000000000 +0200
+++ texlive-texmf-2007/texmf-dist/tex/generic/babel/latin.ldf	2009-10-15 21:09:44.000000000 +0200
@@ -5,47 +5,26 @@
 %% The original source files were:
 %%
 %% latin.dtx  (with options: `code')
+%% 
 %% This is a generated file.
 %% 
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 1989-2000 Johannes L. Braams and any individual authors
 %% listed elsewhere in this file.  All rights reserved.
 %% 
-%% This file was generated from file(s) of the Babel system.
-%% ---------------------------------------------------------
-%% 
-%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%%   http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
-%% 
-%% This work has the LPPL maintenance status "maintained".
-%% 
-%% The Current Maintainer of this work is Johannes Braams.
-%% 
-%% This file may only be distributed together with a copy of the Babel
-%% system. You may however distribute the Babel system without
-%% such generated files.
+%% This file is part of the Babel system release 3.7.
+%% --------------------------------------------------
 %% 
-%% The list of all files belonging to the Babel distribution is
-%% given in the file `manifest.bbl'. See also `legal.bbl for additional
-%% information.
-%% 
-%% The list of derived (unpacked) files belonging to the distribution
-%% and covered by LPPL is defined by the unpacking scripts (with
-%% extension .ins) which are part of the distribution.
-%% 
-%% Copyright 1999-2001 Claudio Beccari All rights reserved.
+%% It may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.1 or, at your option, any later version.
 \ProvidesFile{latin.ldf}
-        [2005/11/17 v2.0g Latin support from the babel system]
+        [2007/03/20 v.2.0f Latin support from the babel system]
 %% File `latin.dtx'
 %% Babel package for LaTeX version 2e
 %% Copyright (C) 1989 - 2005
 %%           by Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams babel at braams.cistron.nl
-%%                          Claudio Beccari beccari at polito.it
+%% Please report errors to: J.L. Braams
+%%                          JLBraams at cistron.nl
 \LdfInit{latin}{captionslatin}
 \ifx\l at latin\@undefined
     \@nopatterns{Latin}
@@ -56,10 +35,6 @@
   \expandafter\addto\expandafter\extraslatin
   \expandafter{\extrasmedievallatin}%
   }
-\bbl at declare@ttribute{latin}{withprosodicmarks}{%
-  \expandafter\addto\expandafter\extraslatin
-  \expandafter{\extraswithprosodicmarks}%
-  }
 \@namedef{captionslatin}{%
   \def\prefacename{Praefatio}%
   \def\refname{Conspectus librorum}%
@@ -84,11 +59,10 @@
   \def\glossaryname{Glossarium}%
   }
 \def\datelatin{%
-  \def\november{Novembris}%
+  \def\november{Novembris}
   \def\today{%
     {\check at mathfonts\fontsize\sf at size\z@\math at fontsfalse\selectfont
-      \uppercase\expandafter{\romannumeral\day}}\nobreakspace
-    \ifcase\month\or
+      \uppercase\expandafter{\romannumeral\day}}~\ifcase\month\or
     Ianuarii\or Februarii\or Martii\or Aprilis\or Maii\or Iunii\or
     Iulii\or Augusti\or Septembris\or Octobris\or \november\or
     Decembris\fi
@@ -105,19 +79,19 @@
 \babel at savevariable{\lccode`\V}%
 \babel at savevariable{\uccode`\u}%
 \lccode`\V=`\u \uccode`\u=`\V}
-\addto\extrasmedievallatin{%
-  \babel at savevariable{\lccode`\^^e6}% T1   \ae
-  \babel at savevariable{\uccode`\^^e6}% T1   \ae
-  \babel at savevariable{\lccode`\^^c6}% T1   \AE
-  \babel at savevariable{\lccode`\^^f7}% T1   \oe
-  \babel at savevariable{\uccode`\^^f7}% T1   \OE
-  \babel at savevariable{\lccode`\^^d7}% T1   \OE
-  \babel at savevariable{\lccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\uccode`\^^1a}% OT1  \ae
-  \babel at savevariable{\lccode`\^^1d}% OT1  \AE
-  \babel at savevariable{\lccode`\^^1b}% OT1  \oe
-  \babel at savevariable{\uccode`\^^1b}% OT1  \OE
-  \babel at savevariable{\lccode`\^^1e}% OT1  \OE
+\addto\extraslatin{%
+  \babel at savevariable{\lccode`\^^e6}% T1
+  \babel at savevariable{\uccode`\^^e6}% T1
+  \babel at savevariable{\lccode`\^^c6}% T1
+  \babel at savevariable{\lccode`\^^f7}% T1
+  \babel at savevariable{\uccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^d7}% T1
+  \babel at savevariable{\lccode`\^^1a}% OT1
+  \babel at savevariable{\uccode`\^^1a}% OT1
+  \babel at savevariable{\lccode`\^^1d}% OT1
+  \babel at savevariable{\lccode`\^^1b}% OT1
+  \babel at savevariable{\uccode`\^^1b}% OT1
+  \babel at savevariable{\lccode`\^^1e}% OT1
   \SetLatinLigatures}
 \providecommand\SetLatinLigatures{%
   \def\@tempA{T1}\ifx\@tempA\f at encoding
@@ -133,76 +107,56 @@
   \fi
   \let\@tempA\@undefined
   }
-\addto\extraslatin{\def\ProsodicMarksOn{%
-\GenericError{(latin)\@spaces\@spaces\@spaces\@spaces}%
-            {Latin language error: \string\ProsodicMarksOn\space
-            is defined by setting the\MessageBreak
-            language attribute to `withprosodicmarks'\MessageBreak
-            If you continue you are likely to encounter\MessageBreak
-            fatal errors that I can't recover}%
-            {See the Latin language description in the babel
-            documentation for explanation}{\@ehd}}}
-\addto\extraslatin{\let\ProsodicMarksOff\relax}
-\catcode`\= \active
-\catcode`\^ \active
-\addto\extraslatin{\languageshorthands{latin}}%
-\addto\extraswithprosodicmarks{\bbl at activate{^}}%
-\addto\extraswithprosodicmarks{\bbl at activate{=}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{^}}%
-\addto\noextraswithprosodicmarks{\bbl at deactivate{=}}%
-\addto\extraswithprosodicmarks{\ProsodicMarks}
-\def\ProsodicMarks{%
-\def\ProsodicMarksOn{\catcode`\^ 13\catcode`\= 13\relax}%
-\def\ProsodicMarksOff{\catcode`\^ 7\catcode`\= 12\relax}%
-\initiate at active@char{^}%
-\initiate at active@char{=}%
+\initiate at active@char{^}
+\initiate at active@char{=}
+\addto\extraslatin{\languageshorthands{latin}}
+\addto\extraslatin{\bbl at activate{^}}
+\addto\extraslatin{\bbl at activate{=}}
+\addto\noextraslatin{\bbl at deactivate{^}}
+\addto\noextraslatin{\bbl at deactivate{=}}
 \declare at shorthand{latin}{^a}{%
-    \textormath{\u{a}\bbl at allowhyphens}{\hat{a}}}%
+    \textormath{\u{a}\allowhyphens}{\hat{a}}}
 \declare at shorthand{latin}{^e}{%
-    \textormath{\u{e}\bbl at allowhyphens}{\hat{e}}}%
+    \textormath{\u{e}\nobreak\hskip\z at skip}{\hat{e}}}
 \declare at shorthand{latin}{^i}{%
-    \textormath{\u{\i}\bbl at allowhyphens}{\hat{\imath}}}%
+    \textormath{\u{\i}\nobreak\hskip\z at skip}{\hat{\imath}}}
 \declare at shorthand{latin}{^o}{%
-    \textormath{\u{o}\bbl at allowhyphens}{\hat{o}}}%
+    \textormath{\u{o}\nobreak\hskip\z at skip}{\hat{o}}}
 \declare at shorthand{latin}{^u}{%
-    \textormath{\u{u}\bbl at allowhyphens}{\hat{u}}}%
+    \textormath{\u{u}\nobreak\hskip\z at skip}{\hat{u}}}
 \declare at shorthand{latin}{=a}{%
-    \textormath{\={a}\bbl at allowhyphens}{\bar{a}}}%
+    \textormath{\={a}\nobreak\hskip\z at skip}{\bar{a}}}
 \declare at shorthand{latin}{=e}{%
-    \textormath{\={e}\bbl at allowhyphens}{\bar{e}}}%
+    \textormath{\={e}\nobreak\hskip\z at skip}{\bar{e}}}
 \declare at shorthand{latin}{=i}{%
-    \textormath{\={\i}\bbl at allowhyphens}{\bar{\imath}}}%
+    \textormath{\={\i}\nobreak\hskip\z at skip}{\bar{\imath}}}
 \declare at shorthand{latin}{=o}{%
-    \textormath{\={o}\bbl at allowhyphens}{\bar{o}}}%
+    \textormath{\={o}\nobreak\hskip\z at skip}{\bar{o}}}
 \declare at shorthand{latin}{=u}{%
-    \textormath{\={u}\bbl at allowhyphens}{\bar{u}}}%
-}
-\catcode`\= 12\relax
-\catcode`\^ 7\relax
+    \textormath{\={u}\nobreak\hskip\z at skip}{\bar{u}}}
 \addto\extraslatin{\def\LatinMarksOn{\shorthandon{^}\shorthandon{=}}}
 \addto\extraslatin{\def\LatinMarksOff{\shorthandoff{^}\shorthandoff{=}}}
-\addtoextraslatin{\LatinMarksOff}
+\catcode`\= 12\relax
+\catcode`\^ 7\relax
 \initiate at active@char{"}%
 \addto\extraslatin{\bbl at activate{"}%
 }
-\declare at shorthand{latin}{"}{%
-  \ifmmode
+\declare at shorthand{latin}{"}{\ifmmode
     \def\lt@@next{''}%
-  \else
+\else
     \def\lt@@next{\futurelet\lt at temp\lt at cwm}%
-  \fi
-  \lt@@next
+\fi
+\lt@@next
 }%
 \def\lt at allowhyphens{\nobreak\discretionary{-}{}{}\nobreak\hskip\z at skip}
 \newcommand*{\lt at cwm}{\let\lt at n@xt\relax
-  \ifcat\noexpand\lt at temp a%
+\ifcat\noexpand\lt at temp a%
     \let\lt at n@xt\lt at allowhyphens
-  \else
+\else
     \if\noexpand\lt at temp\string|%
-      \def\lt at n@xt{\lt at allowhyphens\@gobble}%
+        \def\lt at n@xt{\lt at allowhyphens\@gobble}%
     \fi
-  \fi
-  \lt at n@xt}%
+\fi\lt at n@xt}%
 \ldf at finish{latin}
 %%
 %% \CharacterTable


Index: texlive-filter-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-11/texlive-filter-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- texlive-filter-requires.sh	29 Aug 2008 05:09:04 -0000	1.2
+++ texlive-filter-requires.sh	21 Oct 2009 18:16:40 -0000	1.3
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\)'
+/usr/lib/rpm/perl.req "$@" | grep -v 'perl(\(Tk\|Win32\|only\|path_tre\|just\|Htex\|Pts\|a\|Reg_macro\)'


Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/F-11/texlive-texmf.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- texlive-texmf.spec	25 Feb 2009 20:17:07 -0000	1.32
+++ texlive-texmf.spec	21 Oct 2009 18:16:40 -0000	1.33
@@ -9,9 +9,12 @@
 
 %define	ptex_texmf_ver 2.5
 
+# do not provide any perl deps (#516350)
+%define __perl_provides %{nil}
+
 Name:		texlive-texmf
 Version:	2007
-Release:	28%{?dist}
+Release:	31%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -58,6 +61,7 @@ Patch3:		texlive-2007-texmfconf.patch
 Patch4:		texlive-2007-romanian.patch
 Patch5:		texlive-2007-euro.patch
 Patch6:		texlive-2007-beamerblocks.patch
+Patch7:		texlive-2007-latin.patch
 
 # Patch1000-: Japanese pTeX
 Patch1001: texlive-2007-texmf.cnf-ptex.patch
@@ -181,6 +185,7 @@ install -p -m644 %{SOURCE50} texmf-var/d
 %patch4  -p0
 %patch5  -p0
 %patch6  -p0
+%patch7  -p1
 
 cp -p %{SOURCE91} .
 
@@ -422,6 +427,9 @@ rm -rf %{buildroot}%{_texmf_main}/doc/la
 # remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
 rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
 
+# remove dvipdfm configuration file
+rm -rf %{buildroot}%{_texmf_main}/dvipdfm
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -584,9 +592,6 @@ fi
 %{_texmf_main}/bibtex/bst/[a-b]*/
 %{_texmf_main}/bibtex/bst/camel/
 %{_texmf_main}/bibtex/bst/[d-x]*/
-%dir %{_texmf_main}/dvipdfm
-%dir %{_texmf_main}/dvipdfm/config
-%{_texmf_main}/dvipdfm/config/config
 %dir %{_texmf_main}/fmtutil
 %{_texmf_main}/makeindex/
 %{_texmf_main}/metafont/
@@ -823,6 +828,12 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
+- do not conflict with dvipdfm
+- update perl requires filter
+- update latin.ldf (#469948)
+- do not provide any perl dependencies (#516350)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2007-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


