lots of fixes, new sources sync
This commit is contained in:
Tom Callaway
parent
3a46f83dd3
commit
209d9f560b
|
|
@ -7109,3 +7109,60 @@
|
|||
/yplan.i386-linux.tar.xz
|
||||
/texlive-20150728_r37985-source.tar.xz
|
||||
/texlive-20150728_r37987-source.tar.xz
|
||||
/alertmessage.doc.tar.xz
|
||||
/alertmessage.source.tar.xz
|
||||
/alertmessage.tar.xz
|
||||
/blochsphere.doc.tar.xz
|
||||
/blochsphere.source.tar.xz
|
||||
/blochsphere.tar.xz
|
||||
/bxpdfver.doc.tar.xz
|
||||
/bxpdfver.tar.xz
|
||||
/checklistings.doc.tar.xz
|
||||
/checklistings.i386-linux.tar.xz
|
||||
/checklistings.source.tar.xz
|
||||
/checklistings.tar.xz
|
||||
/cleanthesis.doc.tar.xz
|
||||
/cleanthesis.tar.xz
|
||||
/nar.tar.xz
|
||||
/nmbib.doc.tar.xz
|
||||
/nmbib.source.tar.xz
|
||||
/nmbib.tar.xz
|
||||
/old-arrows.doc.tar.xz
|
||||
/old-arrows.tar.xz
|
||||
/nevelok.doc.tar.xz
|
||||
/nevelok.source.tar.xz
|
||||
/nevelok.tar.xz
|
||||
/e-french.doc.tar.xz
|
||||
/e-french.tar.xz
|
||||
/fitbox.doc.tar.xz
|
||||
/fitbox.source.tar.xz
|
||||
/fitbox.tar.xz
|
||||
/easyreview.doc.tar.xz
|
||||
/easyreview.source.tar.xz
|
||||
/easyreview.tar.xz
|
||||
/medstarbeamer.doc.tar.xz
|
||||
/medstarbeamer.tar.xz
|
||||
/mfirstuc.doc.tar.xz
|
||||
/mfirstuc.source.tar.xz
|
||||
/mfirstuc.tar.xz
|
||||
/multiaudience.doc.tar.xz
|
||||
/multiaudience.source.tar.xz
|
||||
/multiaudience.tar.xz
|
||||
/pdfpagediff.doc.tar.xz
|
||||
/pdfpagediff.tar.xz
|
||||
/proofread.doc.tar.xz
|
||||
/proofread.source.tar.xz
|
||||
/proofread.tar.xz
|
||||
/shdoc.source.tar.xz
|
||||
/uassign.doc.tar.xz
|
||||
/uassign.tar.xz
|
||||
/roundrect.doc.tar.xz
|
||||
/roundrect.source.tar.xz
|
||||
/roundrect.tar.xz
|
||||
/fcavtex.doc.tar.xz
|
||||
/fcavtex.tar.xz
|
||||
/fei.doc.tar.xz
|
||||
/fei.source.tar.xz
|
||||
/fei.tar.xz
|
||||
/xebaposter.doc.tar.xz
|
||||
/xebaposter.tar.xz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
--- etex.src.orig 2015-09-16 14:17:48.263123165 -0400
|
||||
+++ etex.src 2015-09-16 14:14:20.673610421 -0400
|
||||
@@ -290,8 +290,10 @@
|
||||
|
||||
\def \addlanguage #1#2#3#4#5% language patterns exceptions lhm rhm
|
||||
{\expandafter \et@xlang \csname lang@#1\endcsname
|
||||
- \expandafter \chardef \csname lhm@#1\endcsname=#4 % V1.0-1
|
||||
- \expandafter \chardef \csname rhm@#1\endcsname=#5 % V1.0-1
|
||||
+ \def\paramD{#4}\ifx\paramD\empty\def\paramD{1}\fi % Default value lhm is 1 % V2.1-1
|
||||
+ \def\paramE{#5}\ifx\paramD\empty\def\paramE{1}\fi % Default value rhm is 1 % V2.1-1
|
||||
+ \expandafter \chardef \csname lhm@#1\endcsname=\paramD % V2.1-1
|
||||
+ \expandafter \chardef \csname rhm@#1\endcsname=\paramE % V2.1-1
|
||||
\uselanguage {#1}%
|
||||
\input #2
|
||||
\if *#3*\else \input #3 \fi
|
||||
@@ -776,6 +778,9 @@
|
||||
|
||||
%% Revision-history:
|
||||
|
||||
+24-ARP-2015: 2.1;1 Allow empty values on \addlanguages for parameters 4 and 5
|
||||
+ Changed by Edgar Hoch
|
||||
+
|
||||
01-FEB-1999: 2.1;0 Allow file to be used with e-TeX versions 2.0 and 2.1
|
||||
|
||||
25-MAR-1998: 2.0;19 Improved log message for \{glob|loc}{marks|box}vector (PEB)
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
# macros to keep trees in texlive consistent
|
||||
%_texmf /usr/share/texlive/texmf-local
|
||||
%_texmf_main /usr/share/texlive/texmf-dist
|
||||
%_texmf_vendor /usr/share/texlive/texmf-dist
|
||||
%_texmf_var /var/lib/texmf
|
||||
%_texmf_conf /usr/share/texlive/texmf-config
|
||||
|
||||
%texlive_post \
|
||||
mkdir -p /var/run/texlive \
|
||||
touch /var/run/texlive/run-texhash \
|
||||
touch /var/run/texlive/run-mtxrun \
|
||||
:
|
||||
|
||||
%texlive_postun \
|
||||
if [ $1 == 1 ]; then \
|
||||
mkdir -p /var/run/texlive \
|
||||
touch /var/run/run-texhash \
|
||||
else \
|
||||
%{_bindir}/texhash 2> /dev/null \
|
||||
fi \
|
||||
:
|
||||
|
||||
%texlive_posttrans \
|
||||
if [ -e /var/run/texlive/run-texhash ] && [ -e %{_bindir}/texhash ]; then %{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash; fi \
|
||||
if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; %{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi \
|
||||
:
|
||||
73735
texlive.spec
73735
texlive.spec
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
|||
%global source_date 20150728_r37987
|
||||
%global tl_version 2015
|
||||
%global tl_rel 6
|
||||
%global tl_rel 7
|
||||
%global tl_release %{tl_rel}.%{source_date}%{?dist}
|
||||
%global tl_noarch_release %{tl_rel}%{?dist}
|
||||
%global source_name texlive-%{source_date}-source
|
||||
|
|
@ -56,6 +56,7 @@ Patch2: tl-format.patch
|
|||
Patch3: texlive-20150728-selinux-context.patch
|
||||
Patch4: texlive-fix-system-teckit.patch
|
||||
Patch100: texlive-bz979176.patch
|
||||
Patch101: etex-addlanguage-fix-bz1215257.patch
|
||||
Source0: %{source_name}.tar.xz
|
||||
Source1: tl2rpm.c
|
||||
Source2: texlive.tlpdb
|
||||
|
|
@ -66,6 +67,7 @@ Source6: texlive.spec.template
|
|||
Source7: co_source
|
||||
Source8: co_archive
|
||||
Source9: b_one_srpm
|
||||
Source10: macros.texlive
|
||||
%include _sources.spec
|
||||
|
||||
%description
|
||||
|
|
@ -347,13 +349,7 @@ sed -i -e 's|^TEXMFLOCAL.*|TEXMFLOCAL\ =\ \$TEXMFROOT/texmf-local//|' %{buildroo
|
|||
|
||||
# create macro file for building texlive
|
||||
mkdir -p %{buildroot}%{macrosdir}
|
||||
cat << EOF > %{buildroot}%{macrosdir}/macros.texlive
|
||||
# macros to keep trees in texlive consistent
|
||||
%_texmf_main /usr/share/texlive/texmf
|
||||
%_texmf_vendor /usr/share/texlive/texmf
|
||||
%_texmf_var /var/lib/texmf
|
||||
%_texmf_conf /usr/share/texlive/texmf-config
|
||||
EOF
|
||||
cp -a %{SOURCE9} %{buildroot}%{macrosdir}/macros.texlive
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
|
|
|||
2797
texlive.tlpdb
2797
texlive.tlpdb
File diff suppressed because it is too large
Load Diff
22
tl2rpm.c
22
tl2rpm.c
|
|
@ -1957,6 +1957,28 @@ void solve(char *name) {
|
|||
}
|
||||
fprintf(fpack, "Documentation for %s\n\n", name);
|
||||
|
||||
#ifndef SRPMS
|
||||
fprintf(fpack, "%%post %s-doc\n", name);
|
||||
#else
|
||||
fprintf(fpack, "%%post\n");
|
||||
#endif
|
||||
fprintf(fpack, "mkdir -p /var/run/texlive\ntouch /var/run/texlive/run-texhash\n");
|
||||
fprintf(fpack, ":\n");
|
||||
#ifndef SRPMS
|
||||
fprintf(fpack, "\n%%postun %s-doc\n", name);
|
||||
#else
|
||||
fprintf(fpack, "\n%%postun\n");
|
||||
#endif
|
||||
fprintf(fpack, "if [ $1 == 1 ]; then\n mkdir -p /var/run/texlive\n touch /var/run/run-texhash\nelse\n %%{_bindir}/texhash 2> /dev/null\nfi\n");
|
||||
fprintf(fpack, ":\n\n");
|
||||
#ifndef SRPMS
|
||||
fprintf(fpack, "%%posttrans %s-doc\n", name);
|
||||
#else
|
||||
fprintf(fpack, "%%posttrans\n");
|
||||
#endif
|
||||
fprintf(fpack, "if [ -e /var/run/texlive/run-texhash ] && [ -e %%{_bindir}/texhash ]; then %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash; fi\n");
|
||||
fprintf(fpack, ":\n\n");
|
||||
|
||||
/* ... and doc files */
|
||||
#ifdef SRPMS
|
||||
mainpkg = 1;
|
||||
|
|
|
|||
48
tlpdb.patch
48
tlpdb.patch
|
|
@ -1,6 +1,6 @@
|
|||
--- texlive.tlpdb.orig 2015-07-24 13:59:06.546353566 -0400
|
||||
+++ texlive.tlpdb 2015-07-24 14:07:44.646380530 -0400
|
||||
@@ -10347,7 +10347,7 @@
|
||||
--- texlive.tlpdb.orig 2015-09-16 16:29:17.024436938 -0400
|
||||
+++ texlive.tlpdb 2015-09-16 16:29:17.050436761 -0400
|
||||
@@ -10317,7 +10317,7 @@
|
||||
catalogue-license pd
|
||||
catalogue-version 1.0a
|
||||
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
category Package
|
||||
revision 37556
|
||||
shortdesc A font to typeset maths in Xe(La)TeX and Lua(La)TeX.
|
||||
@@ -16090,40 +16090,6 @@
|
||||
@@ -16060,40 +16060,6 @@
|
||||
catalogue-date 2012-04-10 13:05:36 +0200
|
||||
catalogue-license gpl
|
||||
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
name bibexport
|
||||
category Package
|
||||
revision 29349
|
||||
@@ -32900,7 +32866,6 @@
|
||||
@@ -33039,7 +33005,6 @@
|
||||
depend tex
|
||||
depend texconfig
|
||||
depend texlive-common
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
depend texlive-en
|
||||
depend texlive-msg-translations
|
||||
depend texlive-scripts
|
||||
@@ -33145,7 +33110,7 @@
|
||||
@@ -33287,7 +33252,7 @@
|
||||
shortdesc Additional fonts
|
||||
relocated 1
|
||||
depend collection-basic
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
depend academicons
|
||||
depend accanthis
|
||||
depend adforn
|
||||
@@ -33291,7 +33256,7 @@
|
||||
@@ -33434,7 +33399,7 @@
|
||||
depend librebaskerville
|
||||
depend librecaslon
|
||||
depend libris
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
depend lobster2
|
||||
depend lxfonts
|
||||
depend ly1
|
||||
@@ -35567,7 +35532,7 @@
|
||||
@@ -35721,7 +35686,7 @@
|
||||
depend m-tx
|
||||
depend musixguit
|
||||
depend musixtex
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
depend musixtnt
|
||||
depend piano
|
||||
depend pmx
|
||||
@@ -36093,25 +36058,6 @@
|
||||
@@ -36253,25 +36218,6 @@
|
||||
depend xymtex
|
||||
depend youngtab
|
||||
|
||||
|
|
@ -110,8 +110,8 @@
|
|||
-
|
||||
name collection-xetex
|
||||
category Collection
|
||||
revision 37812
|
||||
@@ -47337,7 +47283,7 @@
|
||||
revision 38257
|
||||
@@ -47514,7 +47460,7 @@
|
||||
texmf-dist/source/support/dosepsbin/install-sh
|
||||
catalogue-ctan /support/dosepsbin
|
||||
catalogue-date 2014-10-16 20:09:26 +0200
|
||||
|
|
@ -120,7 +120,7 @@
|
|||
catalogue-version 1.2
|
||||
|
||||
name dosepsbin.i386-linux
|
||||
@@ -79525,13 +79471,6 @@
|
||||
@@ -79894,13 +79840,6 @@
|
||||
catalogue-license lppl
|
||||
catalogue-version v1.7
|
||||
|
||||
|
|
@ -134,7 +134,7 @@
|
|||
name interactiveworkbook
|
||||
category Package
|
||||
revision 15878
|
||||
@@ -91001,7 +90940,7 @@
|
||||
@@ -91373,7 +91312,7 @@
|
||||
catalogue-ctan /macros/latex/contrib/labels
|
||||
catalogue-date 2011-12-16 16:22:52 +0100
|
||||
catalogue-license lppl1.2
|
||||
|
|
@ -143,7 +143,7 @@
|
|||
|
||||
name labyrinth
|
||||
category Package
|
||||
@@ -92632,72 +92571,6 @@
|
||||
@@ -93004,72 +92943,6 @@
|
||||
catalogue-license gpl
|
||||
catalogue-version 2.1.19.1
|
||||
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
name latexmp
|
||||
category Package
|
||||
revision 15878
|
||||
@@ -97951,7 +97824,7 @@
|
||||
@@ -98324,7 +98197,7 @@
|
||||
catalogue-date 2012-04-03 18:09:05 +0200
|
||||
catalogue-license lppl
|
||||
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
category Package
|
||||
revision 15878
|
||||
shortdesc Linear A script fonts.
|
||||
@@ -108984,7 +108857,7 @@
|
||||
@@ -109422,7 +109295,7 @@
|
||||
texmf-dist/source/generic/mkjobtexmf/install-sh
|
||||
catalogue-ctan /support/mkjobtexmf
|
||||
catalogue-date 2011-11-16 11:07:17 +0100
|
||||
|
|
@ -234,7 +234,7 @@
|
|||
catalogue-version 0.8
|
||||
|
||||
name mkjobtexmf.i386-linux
|
||||
@@ -111142,7 +111015,7 @@
|
||||
@@ -111632,7 +111505,7 @@
|
||||
catalogue-license lppl1.3
|
||||
catalogue-version 1.2.2
|
||||
|
||||
|
|
@ -243,7 +243,7 @@
|
|||
category Package
|
||||
revision 37762
|
||||
shortdesc Fonts used by MusixTeX.
|
||||
@@ -122536,6 +122409,7 @@
|
||||
@@ -123189,6 +123062,7 @@
|
||||
longdesc LuaTeX).
|
||||
depend kpathsea
|
||||
depend pdftex.ARCH
|
||||
|
|
@ -251,7 +251,7 @@
|
|||
execute AddFormat name=pdftex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini"
|
||||
execute AddFormat name=etex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *etex.ini"
|
||||
execute AddFormat name=pdfetex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini"
|
||||
@@ -130606,7 +130480,7 @@
|
||||
@@ -131343,7 +131217,7 @@
|
||||
catalogue-ctan /graphics/pstricks/contrib/pst-layout
|
||||
catalogue-date 2014-02-26 23:03:13 +0100
|
||||
catalogue-license lppl
|
||||
|
|
@ -260,7 +260,7 @@
|
|||
|
||||
name pst-lens
|
||||
category Package
|
||||
@@ -143818,7 +143692,7 @@
|
||||
@@ -144593,7 +144467,7 @@
|
||||
depend kurier
|
||||
depend poltawski
|
||||
depend xits
|
||||
|
|
@ -269,7 +269,7 @@
|
|||
depend gentium-tug
|
||||
depend pxfonts
|
||||
depend txfonts
|
||||
@@ -158640,7 +158514,7 @@
|
||||
@@ -159412,7 +159286,7 @@
|
||||
texmf-dist/doc/man/man1/texdirflatten.man1.pdf
|
||||
catalogue-ctan /support/texdirflatten
|
||||
catalogue-date 2014-02-26 23:03:13 +0100
|
||||
|
|
@ -278,7 +278,7 @@
|
|||
catalogue-version 1.1
|
||||
|
||||
name texdirflatten.i386-linux
|
||||
@@ -160242,7 +160116,6 @@
|
||||
@@ -161016,7 +160890,6 @@
|
||||
revision 29741
|
||||
shortdesc i386-linux files of texlive-scripts
|
||||
binfiles arch=i386-linux size=2
|
||||
|
|
@ -286,7 +286,7 @@
|
|||
bin/i386-linux/rungs
|
||||
|
||||
name texlive-sr
|
||||
@@ -165940,7 +165813,7 @@
|
||||
@@ -166717,7 +166590,7 @@
|
||||
catalogue-ctan /macros/latex209/contrib/trees/tree-dvips
|
||||
catalogue-date 2012-01-20 11:26:32 +0100
|
||||
catalogue-license lppl1
|
||||
|
|
@ -295,7 +295,7 @@
|
|||
|
||||
name treetex
|
||||
category Package
|
||||
@@ -178789,7 +178662,6 @@
|
||||
@@ -179710,7 +179583,6 @@
|
||||
revision 37261
|
||||
shortdesc i386-linux files of xetex
|
||||
binfiles arch=i386-linux size=6435
|
||||
|
|
|
|||
Loading…
Reference in New Issue