rpms/texlive-texmf/F-10 texlive-2007-latin.patch, NONE, 1.1 texlive-filter-requires.sh, 1.2, 1.3 texlive-texmf.spec, 1.30, 1.31
Jindrich Novy
jnovy at fedoraproject.org
Wed Oct 21 18:42:26 UTC 2009
Author: jnovy
Update of /cvs/pkgs/rpms/texlive-texmf/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16436
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)
- remove binaries from splitindex (#476636)
- add unowned dirs into the filelist (#474027)
- fix patch to brp-compress script (#468179)
- remove F8 related chunks from spec
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-10/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:42:26 -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-10/texlive-texmf.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- texlive-texmf.spec 14 Oct 2008 11:34:35 -0000 1.30
+++ texlive-texmf.spec 21 Oct 2009 18:42:26 -0000 1.31
@@ -8,11 +8,13 @@
%{!?_texmf_local: %global _texmf_local %{_usr}/local/share/texmf}
%define ptex_texmf_ver 2.5
-%define f8_packaging 0
+
+# do not provide any perl deps (#516350)
+%define __perl_provides %{nil}
Name: texlive-texmf
Version: 2007
-Release: 26%{?dist}
+Release: 31%{?dist}
Summary: Architecture independent parts of the TeX formatting system
Group: Applications/Publishing
@@ -43,7 +45,7 @@ Source99: texlive-filter-requires.sh
%define __perl_requires %{SOURCE99}
# speed up build, run only brp-compress, nothing else is needed
-%define __os_install_post /usr/lib/rpm/redhat/brp-compress %{nil}
+%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
# Source1000-: Japanese pTeX
Source1000: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/ptex-texmf-%{ptex_texmf_ver}.tar.gz
@@ -59,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
@@ -130,11 +133,7 @@ Group: Applications/Publishing
Summary: Texmf files needed for texlive-latex
Requires: texlive-texmf = %{version}-%{release}
Requires: texlive-texmf-errata-latex = %{version}
-%if !%{f8_packaging}
Requires: tex-preview
-%else
-Requires: tetex-preview
-%endif
%description latex
This package contains the components of the TEXMF tree needed for the
@@ -186,6 +185,7 @@ install -p -m644 %{SOURCE50} texmf-var/d
%patch4 -p0
%patch5 -p0
%patch6 -p0
+%patch7 -p1
cp -p %{SOURCE91} .
@@ -406,10 +406,8 @@ install -d -m755 %{buildroot}%{_texmf_ve
touch %{buildroot}%{_texmf_vendor}/ls-R
touch %{buildroot}%{_texmf_conf}/ls-R
-%if !%{f8_packaging}
# remove xdvi files, now packaged separately
rm -rf %{buildroot}%{_texmf_var}/xdvi
-%endif
# remove dvipdfmx files
rm %{buildroot}%{_texmf_main}/dvipdfm/{dvipdfmx.cfg,EUC-UCS2,README,UniKSCms-UCS2-H,UniKSCms-UCS2-V}
@@ -421,10 +419,16 @@ rm %{buildroot}%{_texmf_main}/dvipdfm/co
rm -rf %{buildroot}%{_texmf_main}/tex/latex/preview/
rm -rf %{buildroot}%{_texmf_main}/doc/latex/preview/
-%if !%{f8_packaging}
+# remove binaries from splitindex (#476636)
+rm -rf %{buildroot}%{_texmf_main}/doc/latex/splitindex/*i386* \
+%{buildroot}%{_texmf_main}/doc/latex/splitindex/*.exe \
+%{buildroot}%{_texmf_main}/doc/latex/splitindex/*.class
+
# remove $TEXMFMAIN/tex/texinfo to not to clash with texinfo (#226488)
rm -rf %{buildroot}%{_texmf_main}/tex/texinfo/
-%endif
+
+# remove dvipdfm configuration file
+rm -rf %{buildroot}%{_texmf_main}/dvipdfm
# create macro file for building texlive
mkdir -p %{buildroot}%{_sysconfdir}/rpm
@@ -581,15 +585,13 @@ fi
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/rpm/macros.texlive
%doc texlive.%{version}.zip.list
+%dir %{_texmf_main}/bibtex
%{_texmf_main}/bibtex/bib/
%{_texmf_main}/bibtex/csf/
%dir %{_texmf_main}/bibtex/bst
%{_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/
@@ -626,9 +628,6 @@ fi
%{_texmf_main}/tex/lambda/base/*.def
%{_texmf_main}/tex/lambda/base/*.sty
%{_texmf_main}/tex/lambda/oinuit/
-%if %{f8_packaging}
-%{_texmf_main}/tex/texinfo/
-%endif
%{_texmf_main}/tex/mex/
%{_texmf_main}/tex/mltex/
%{_texmf_main}/tex/plain/
@@ -668,23 +667,23 @@ fi
%{_texmf_main}/web2c/pdftex.pool
%{_texmf_main}/web2c/tex.pool
# var
-%if %{f8_packaging}
-%dir %{_texmf_var}/xdvi
-%config(noreplace) %{_texmf_var}/xdvi/XDvi
-%endif
%config(noreplace) %{_texmf_var}/web2c/mktex.cnf
-%{_texmf_var}/tex/generic/
-%{_texmf_var}/tex/plain/
+%dir %{_texmf_var}/tex/
+%{_texmf_var}/tex/generic
+%{_texmf_var}/tex/plain
%dir %{_texmf_var}/fonts
%dir %{_texmf_var}/fonts/map
%dir %{_texmf_var}/fonts/map/dvipdfm
%dir %{_texmf_var}/fonts/map/dvipdfm/updmap
+%dir %{_texmf_var}/fonts/map/dvips
+%dir %{_texmf_var}/fonts/map/pdftex
%ghost %{_texmf_var}/fonts/map/dvipdfm/updmap/*
%dir %{_texmf_var}/fonts/map/dvips/updmap
%ghost %{_texmf_var}/fonts/map/dvips/updmap/*
%dir %{_texmf_var}/fonts/map/pdftex/updmap
%ghost %{_texmf_var}/fonts/map/pdftex/updmap/*
-%{_texmf_var}/dvipdfm/
+%{_texmf_var}/dvipdfm
+%{_texmf_var}/web2c
# info
%{_infodir}/tds.info.*
# ls-R
@@ -775,9 +774,9 @@ fi
%files fonts
%defattr(-,root,root,-)
+%dir %{_texmf_main}/fonts
%dir %{_texmf_main}/fonts/enc
%dir %{_texmf_main}/fonts/map
-%dir %{_texmf_main}/fonts
%{_texmf_main}/fonts/map/fontname/
%{_texmf_main}/fonts/cmap/
%{_texmf_main}/fonts/ofm/
@@ -829,6 +828,16 @@ 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)
+- remove binaries from splitindex (#476636)
+- add unowned dirs into the filelist (#474027)
+- fix patch to brp-compress script (#468179)
+- remove F8 related chunks from spec
+
* Mon Oct 13 2008 Jindrich Novy <jnovy at redhat.com> - 2007-26
- increase limits in texmf.cnf so that PostgreSQL documentation build
passes (#460982)
More information about the fedora-extras-commits
mailing list