Sync with upstream, remove only generated fmt files upon update
This commit is contained in:
parent
e79b846cfc
commit
394d57b1af
26804
texlive.spec
26804
texlive.spec
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
%global source_date 20131226_r32488
|
||||
%global source_date 20140217_r32990
|
||||
%global tl_version 2013
|
||||
%global tl_rel 5
|
||||
%global tl_rel 6
|
||||
%global tl_release %{tl_rel}.%{source_date}%{?dist}
|
||||
%global tl_noarch_release %{tl_rel}%{?dist}
|
||||
%global source_name texlive-%{source_date}-source
|
||||
@ -46,8 +46,7 @@ Obsoletes: texlive-texmf-errata-east-asian < %{tl_version}, texlive-texmf-errata
|
||||
Obsoletes: texlive-texmf-errata-latex < %{tl_version}, texlive-texmf-errata-xetex < %{tl_version}
|
||||
Conflicts: texlive-dvips = 2007
|
||||
Patch1: tl-kpfix.patch
|
||||
Patch2: tl-testfix.patch
|
||||
Patch3: tl-format.patch
|
||||
Patch2: tl-format.patch
|
||||
Source0: %{source_name}.tar.xz
|
||||
Source1: tl2rpm.c
|
||||
Source2: texlive.tlpdb
|
||||
@ -109,14 +108,13 @@ xz -dc %{SOURCE0} | tar x
|
||||
[ -e %{source_name} ] && mv %{source_name} source
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
%patch3 -p0
|
||||
for l in `unxz -c %{SOURCE3} | tar t`; do
|
||||
ln -s %{_texdir}/licenses/$l $l
|
||||
done
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -std=c++03 -fno-strict-aliasing"
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -std=c++03 -fno-strict-aliasing -Werror=format-security"
|
||||
cd source
|
||||
PREF=`pwd`/inst
|
||||
mkdir -p work
|
||||
@ -243,7 +241,8 @@ rm -f man
|
||||
[ ! -e mfplain ] && ln -s mpost mfplain
|
||||
[ ! -e texlua ] && ln -s luatex texlua
|
||||
[ ! -e texluac ] && ln -s luatex texluac
|
||||
for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk texdiff convbkmk songidx; do
|
||||
# remove binaries we don't ship
|
||||
for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog latexmk texdiff convbkmk songidx wofm2opl wopl2ofm wovf2ovp paperconf luajittex texluajit texluajitc; do
|
||||
rm -f $i
|
||||
rm -f %{buildroot}%{_datadir}/texlive/texmf-dist/doc/man/man1/$i.*
|
||||
done
|
||||
@ -336,7 +335,7 @@ rm -rf %{buildroot}
|
||||
rm -rf %{_texdir}/texmf-var
|
||||
rm -rf %{_texmf_var}/*
|
||||
for i in `find /home/* -type d -prune`; do
|
||||
rm -rf $i/.texlive*
|
||||
find $i/.texlive* -name \*.fmt -type f | xargs rm -f > /dev/null 2>&1
|
||||
done
|
||||
:
|
||||
|
||||
@ -381,6 +380,10 @@ fi
|
||||
%{_libdir}/*.so
|
||||
|
||||
%changelog
|
||||
* Thu Dec 26 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-6-20140217
|
||||
- sync with upstream
|
||||
- remove only generated fmt files upon update
|
||||
|
||||
* Fri Feb 14 2014 David Tardon <dtardon@redhat.com> - 2013-5-20131226
|
||||
- rebuild for new ICU
|
||||
|
||||
|
5507
texlive.tlpdb
5507
texlive.tlpdb
File diff suppressed because it is too large
Load Diff
@ -1,30 +0,0 @@
|
||||
diff -up texlive-2013/source/texk/web2c/luatexdir/luaimage.test.testfix texlive-2013/source/texk/web2c/luatexdir/luaimage.test
|
||||
--- source/texk/web2c/luatexdir/luaimage.test.testfix 2013-10-07 16:47:55.000000000 +0200
|
||||
+++ source/texk/web2c/luatexdir/luaimage.test 2013-10-11 21:54:05.820113274 +0200
|
||||
@@ -9,8 +9,8 @@ TEXFORMATS=.
|
||||
|
||||
export TEXMFCNF TEXINPUTS TEXFORMATS
|
||||
|
||||
-./luatex -ini luaimage || exit 1
|
||||
+./luatex -ini luaimage || exit 0
|
||||
|
||||
-./luatex -fmt=luaimage luaimage || exit 1
|
||||
+./luatex -fmt=luaimage luaimage || exit 0
|
||||
|
||||
exit 0
|
||||
\ Chybí znak konce řádku na konci souboru
|
||||
diff -up texlive-2013/source/texk/web2c/pdftexdir/pdfimage.test.testfix texlive-2013/source/texk/web2c/pdftexdir/pdfimage.test
|
||||
--- source/texk/web2c/pdftexdir/pdfimage.test.testfix 2013-10-07 16:47:54.000000000 +0200
|
||||
+++ source/texk/web2c/pdftexdir/pdfimage.test 2013-10-11 21:53:42.485134210 +0200
|
||||
@@ -9,8 +9,8 @@ TEXFORMATS=.
|
||||
|
||||
export TEXMFCNF TEXINPUTS TEXFORMATS
|
||||
|
||||
-./pdftex -ini pdfimage || exit 1
|
||||
+./pdftex -ini pdfimage || exit 0
|
||||
|
||||
-./pdftex -fmt=pdfimage pdfimage || exit 1
|
||||
+./pdftex -fmt=pdfimage pdfimage || exit 0
|
||||
|
||||
exit 0
|
||||
\ Chybí znak konce řádku na konci souboru
|
46
tlpdb.patch
46
tlpdb.patch
@ -1,5 +1,5 @@
|
||||
--- texlive.tlpdb.orig 2013-12-21 08:45:06.069364510 +0100
|
||||
+++ texlive.tlpdb 2013-12-22 18:36:30.121318962 +0100
|
||||
--- texlive.tlpdb.orig 2014-02-17 09:48:50.385042361 +0100
|
||||
+++ texlive.tlpdb 2014-02-17 09:48:50.522042844 +0100
|
||||
@@ -76,7 +76,7 @@
|
||||
catalogue-ctan /macros/latex/contrib/abc
|
||||
catalogue-date 2008-03-08 20:47:21 +0100
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
name abntex2
|
||||
category Package
|
||||
@@ -7899,7 +7899,7 @@
|
||||
@@ -9853,7 +9853,7 @@
|
||||
catalogue-license pd
|
||||
catalogue-version 1.0a
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
category Package
|
||||
revision 31750
|
||||
shortdesc A font to typeset maths in Xe(La)TeX and Lua(La)TeX.
|
||||
@@ -12609,38 +12609,6 @@
|
||||
@@ -14567,38 +14567,6 @@
|
||||
catalogue-date 2006-12-29 13:11:21 +0100
|
||||
catalogue-license gpl
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
name bibexport
|
||||
category Package
|
||||
revision 29349
|
||||
@@ -26715,7 +26683,6 @@
|
||||
@@ -28764,7 +28732,6 @@
|
||||
depend tex
|
||||
depend texconfig
|
||||
depend texlive-common
|
||||
@ -65,7 +65,7 @@
|
||||
depend texlive-en
|
||||
depend texlive-msg-translations
|
||||
depend texlive-scripts
|
||||
@@ -26935,7 +26902,7 @@
|
||||
@@ -28986,7 +28953,7 @@
|
||||
shortdesc Additional fonts
|
||||
relocated 1
|
||||
depend collection-basic
|
||||
@ -74,16 +74,16 @@
|
||||
depend accanthis
|
||||
depend adforn
|
||||
depend adfsymbols
|
||||
@@ -27063,7 +27030,7 @@
|
||||
@@ -29115,7 +29082,7 @@
|
||||
depend librebaskerville
|
||||
depend librecaslon
|
||||
depend libris
|
||||
-depend linearA
|
||||
+depend lineara
|
||||
depend lobster2
|
||||
depend lxfonts
|
||||
depend ly1
|
||||
depend mathabx
|
||||
@@ -29126,7 +29093,7 @@
|
||||
@@ -31189,7 +31156,7 @@
|
||||
depend m-tx
|
||||
depend musixguit
|
||||
depend musixtex
|
||||
@ -92,7 +92,7 @@
|
||||
depend pmx
|
||||
depend pmxchords
|
||||
depend songbook
|
||||
@@ -29593,25 +29560,6 @@
|
||||
@@ -31661,25 +31628,6 @@
|
||||
depend xymtex
|
||||
depend youngtab
|
||||
|
||||
@ -118,7 +118,7 @@
|
||||
name collection-xetex
|
||||
category Collection
|
||||
revision 30396
|
||||
@@ -38566,7 +38514,7 @@
|
||||
@@ -40845,7 +40793,7 @@
|
||||
texmf-dist/source/support/dosepsbin/install-sh
|
||||
catalogue-ctan /support/dosepsbin
|
||||
catalogue-date 2012-03-22 21:51:23 +0100
|
||||
@ -127,7 +127,7 @@
|
||||
catalogue-version 1.2
|
||||
|
||||
name dosepsbin.i386-linux
|
||||
@@ -65080,13 +65028,6 @@
|
||||
@@ -67821,13 +67769,6 @@
|
||||
catalogue-license lppl
|
||||
catalogue-version v1.7
|
||||
|
||||
@ -141,7 +141,7 @@
|
||||
name interactiveworkbook
|
||||
category Package
|
||||
revision 15878
|
||||
@@ -75899,7 +75840,7 @@
|
||||
@@ -78716,7 +78657,7 @@
|
||||
catalogue-ctan /macros/latex/contrib/labels
|
||||
catalogue-date 2009-09-29 00:01:21 +0200
|
||||
catalogue-license lppl1.2
|
||||
@ -150,7 +150,7 @@
|
||||
|
||||
name lacheck
|
||||
category TLCore
|
||||
@@ -77218,73 +77159,6 @@
|
||||
@@ -80035,73 +79976,6 @@
|
||||
binfiles arch=i386-linux size=1
|
||||
bin/i386-linux/latexindent
|
||||
|
||||
@ -224,7 +224,7 @@
|
||||
name latexmp
|
||||
category Package
|
||||
revision 15878
|
||||
@@ -82656,7 +82530,7 @@
|
||||
@@ -85472,7 +85346,7 @@
|
||||
catalogue-date 2007-01-08 23:14:30 +0100
|
||||
catalogue-license lppl
|
||||
|
||||
@ -233,7 +233,7 @@
|
||||
category Package
|
||||
revision 15878
|
||||
shortdesc Linear A script fonts.
|
||||
@@ -94154,7 +94028,7 @@
|
||||
@@ -97036,7 +96910,7 @@
|
||||
texmf-dist/source/generic/mkjobtexmf/install-sh
|
||||
catalogue-ctan /support/mkjobtexmf
|
||||
catalogue-date 2011-11-16 11:07:17 +0100
|
||||
@ -242,7 +242,7 @@
|
||||
catalogue-version 0.8
|
||||
|
||||
name mkjobtexmf.i386-linux
|
||||
@@ -96215,7 +96089,7 @@
|
||||
@@ -99097,7 +98971,7 @@
|
||||
catalogue-license lppl1.3
|
||||
catalogue-version 1.2.2
|
||||
|
||||
@ -251,7 +251,7 @@
|
||||
category Package
|
||||
revision 28934
|
||||
shortdesc Fonts used by MusixTeX.
|
||||
@@ -114061,7 +113935,7 @@
|
||||
@@ -117039,7 +116913,7 @@
|
||||
catalogue-ctan /graphics/pstricks/contrib/pst-layout
|
||||
catalogue-date 2012-04-27 12:45:13 +0200
|
||||
catalogue-license lppl
|
||||
@ -260,7 +260,7 @@
|
||||
|
||||
name pst-lens
|
||||
category Package
|
||||
@@ -126668,7 +126542,7 @@
|
||||
@@ -129751,7 +129625,7 @@
|
||||
depend kurier
|
||||
depend poltawski
|
||||
depend xits
|
||||
@ -269,7 +269,7 @@
|
||||
depend gentium-tug
|
||||
depend txfonts
|
||||
depend pxfonts
|
||||
@@ -133917,7 +133791,7 @@
|
||||
@@ -137099,7 +136973,7 @@
|
||||
texmf-dist/doc/man/man1/texdirflatten.man1.pdf
|
||||
catalogue-ctan /support/texdirflatten
|
||||
catalogue-date 2012-01-12 19:29:56 +0100
|
||||
@ -278,7 +278,7 @@
|
||||
catalogue-version 1.1
|
||||
|
||||
name texdirflatten.i386-linux
|
||||
@@ -135465,7 +135339,6 @@
|
||||
@@ -138647,7 +138521,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
|
||||
@@ -144715,7 +144588,7 @@
|
||||
@@ -147917,7 +147790,7 @@
|
||||
catalogue-ctan /macros/latex209/contrib/trees/tree-dvips
|
||||
catalogue-date 2011-03-14 14:09:23 +0100
|
||||
catalogue-license lppl1
|
||||
@ -295,7 +295,7 @@
|
||||
|
||||
name treetex
|
||||
category Package
|
||||
@@ -156869,7 +156742,6 @@
|
||||
@@ -160129,7 +160002,6 @@
|
||||
revision 30845
|
||||
shortdesc i386-linux files of xetex
|
||||
binfiles arch=i386-linux size=5465
|
||||
|
Loading…
Reference in New Issue
Block a user