rpms
/
texlive
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to TeX Live 2013

This commit is contained in:
Jindrich Novy 2013-06-12 18:02:17 +02:00
parent f1af96369e
commit 8caac5fe2e
7 changed files with 750 additions and 976 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5200,7 +5200,7 @@
/texlive-scripts.tar.xz
/texlive-sr.doc.tar.xz
/texlive-zh-cn.doc.tar.xz
/texlive-20130531_r30819-source.tar.xz
/texlive-20130608_r30832-source.tar.xz
/texloganalyser.doc.tar.xz
/texloganalyser.i386-linux.tar.xz
/texloganalyser.tar.xz

2
co_archive
View File

@ -14,8 +14,8 @@ echo "Syncing with remote server..."
[ -e texlive/archive/musixtex-fnts.doc.tar.xz ] && mv texlive/archive/musixtex-fnts.doc.tar.xz texlive/archive/musixtex-fonts.doc.tar.xz
#rsync -av --delete ftp.cstug.cz::pub/tex/local/tlpretest/archive texlive --delete-excluded \
#rsync -av --delete rsync://ftp.ctex.org/mirrors/texlive/tlpretest/ texlive --delete-excluded \
#rsync -av --delete rsync://ftp.ctex.org/mirrors/CTAN/systems/texlive/tlnet/ texlive --delete-excluded \
#rsync -av --delete rsync://ftp.fernuni-hagen.de/ctan/systems/texlive/tlnet/archive texlive --delete-excluded \
#rsync -av --delete rsync://ftp.ctex.org/mirrors/CTAN/systems/texlive/tlnet/ texlive --delete-excluded \
rsync -av --delete ftp.cstug.cz::pub/tex/local/tlpretest/archive texlive --delete-excluded \
--exclude '*mactex*' \
--exclude '*.win32*' \

2
sources
View File

@ -5200,7 +5200,7 @@ b74ce3aee8ef888536fe2a9219e962b5 texlive-scripts.doc.tar.xz
9e76d60dec639edd4e250b04d4f74766 texlive-scripts.tar.xz
c6742942b42399b8bc4ff617b783b524 texlive-sr.doc.tar.xz
910901aee9fe78d9956a850880914eaf texlive-zh-cn.doc.tar.xz
b64ab5ac8f485e880c809d4f6b7b5d83 texlive-20130531_r30819-source.tar.xz
777eec41dcfb2231c6b2ee4242246295 texlive-20130608_r30832-source.tar.xz
dd61bb4c5e070a47a96149d9e2e21445 texloganalyser.doc.tar.xz
b9a82dd58b5f132bae570c57a11db4aa texloganalyser.i386-linux.tar.xz
9c5b6a7021b601df4285d02bba729d0d texloganalyser.tar.xz

1676
texlive.spec
View File

File diff suppressed because it is too large Load Diff

16
texlive.spec.template
View File

@ -1,6 +1,6 @@
%global source_date 20130531_r30819
%global tl_version 2012
%global tl_rel 24
%global source_date 20130608_r30832
%global tl_version 2013
%global tl_rel 0.1
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -17,7 +17,7 @@
Name: texlive
Version: %{tl_version}
Release: %{tl_release}
Epoch: 2
Epoch: 3
Summary: TeX formatting system
Group: Applications/Publishing
License: Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia
@ -368,6 +368,14 @@ fi
%{_libdir}/*.so
%changelog
* Wed Jun 12 2013 Jindrich Novy <novyjindrich@gmail.com> - 2013-0.1-20130608
- formally switch to 2013 based on upstream
- call updmap-sys and fmtutil-sys for map and format updates
- bump epoch to be sure all noarch packages get updated
* Tue Jun 11 2013 Jon Ciesla <limburgher@gmail.com> - 2012-25-20130531
- Rebuild for new gd.
* Sun Jun 2 2013 Jindrich Novy <novyjindrich@gmail.com> - 2012-24-20130531
- fix luatex breakage (#959625)
- fix updmap-sys calls (#968573, #968573)

26
tl2rpm.c
View File

@ -1343,7 +1343,7 @@ void solve(char *name) {
fprintf(fpack, REQ_POSTTRANS"texlive-kpathsea-bin, tex-kpathsea\n");
if ( pkg[i].exes ) {
fprintf(fpack, REQ_POSTTRANS"texlive-tetex-bin, tex-tetex\n");
fprintf(fpack, REQ_POST_POSTUN"texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base\n");
fprintf(fpack, REQ_POST_POSTUN"texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra\n");
}
/* require coreutils if there is %post scriptlet present */
if ( pkg[i].exes || pkg[i].runfs ) fprintf(fpack, REQ_POST_POSTUN"coreutils\n");
@ -1568,25 +1568,22 @@ void solve(char *name) {
continue;
}
if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
fprintf(fpack, "echo \"Map %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][7]);
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --enable Map=%s > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "echo \"MixedMap %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --enable MixedMap=%s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "echo \"KanjiMap %s\" >> %%{_texdir}/texmf-dist/web2c/updmap.cfg\n", &pkg[i].exe[n][12]);
fprintf(fpack, "%%{_bindir}/updmap-sys --quiet --enable KanjiMap=%s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "BuildFormat ", 12) ) {
fprintf(fpack, "sed -i 's/^\\#\\!\\ %s/%s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
fprintf(fpack, "%%{_bindir}/fmtutil-sys --enablefmt %s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
run_fmtutil = 1;
continue;
}
@ -1697,22 +1694,22 @@ void solve(char *name) {
continue;
}
if ( !strncmp(pkg[i].exe[n], "addMap ", 7) ) {
fprintf(fpack, "sed -i '/^Map %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
fprintf(fpack, "%%{_bindir}/updmap-sys --disable Map=%s > /dev/null 2>&1\n", &pkg[i].exe[n][7]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "addMixedMap ", 12) ) {
fprintf(fpack, "sed -i '/^MixedMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
fprintf(fpack, "%%{_bindir}/updmap-sys --disable MixedMap=%s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "addKanjiMap ", 12) ) {
fprintf(fpack, "sed -i '/^KanjiMap %s/d' %%{_texdir}/texmf-dist/web2c/updmap.cfg > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
fprintf(fpack, "%%{_bindir}/updmap-sys --disable KanjiMap=%s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
run_updmap = 1;
continue;
}
if ( !strncmp(pkg[i].exe[n], "BuildFormat ", 12) ) {
fprintf(fpack, "sed -i 's/^%s.*$/\\#\\!\\ %s/' %%{_texdir}/texmf-dist/web2c/fmtutil.cnf > /dev/null 2>&1\n", &pkg[i].exe[n][12], &pkg[i].exe[n][12]);
fprintf(fpack, "%%{_bindir}/fmtutil-sys --disablefmt %s > /dev/null 2>&1\n", &pkg[i].exe[n][12]);
run_fmtutil = 1;
continue;
}
@ -1852,15 +1849,16 @@ void solve(char *name) {
#ifdef SRPMS
mainpkg = 1;
#endif
main_written = 0;
append_filelist(pkg[i].name, "", pkg[i].runfs, pkg[i].runf, pkg[i].fedora_license?pkg[i].fedora_license:put_token(pkg[i].catalogue_license, license));
#ifdef SRPMS
mainpkg = 0;
#endif
}
main_written = pkg[i].runfs || pkg[i].reqs || pkg[i].exes;
#ifdef PACKAGE_DOCS
/* write doc package if exists */
if ( pkg[i].docfs ) {
main_written = pkg[i].runfs || pkg[i].reqs || pkg[i].exes;
if ( !doc_expanded ) {
fprintf(funpack, UNPACK" -dc %%{SOURCE%d} | tar x -C %%{buildroot}%%{_texdir}%s\n", srcno, pkg[i].reloc?"/texmf-dist":"");
fprintf(fsrc, "Source%04d: "CTAN_URL"%s.doc.tar."UNPACK"\n", srcno++, name);
@ -2057,7 +2055,7 @@ void solve(char *name) {
fprintf(fpack, "Summary: Binaries for %s\n", name);
fprintf(fpack, "Version: %s\n", print_noarch_version(&pkg[i]));
if ( strncmp(name, "kpathsea", 8) ) fprintf(fpack, "Requires: texlive-base\n"); //else fprintf(fpack, "Provides: kpathsea = %%{tl_version}\nObsoletes: kpathsea < %%{tl_version}\n");
if ( pkg[i].runfs ) fprintf(fpack, "Requires: tex-%s\n", name);
if ( main_written ) fprintf(fpack, "Requires: tex-%s\n", name); else printf("!%s\n", name);
fprintf(fpack, "Requires: texlive-kpathsea-lib = %%{epoch}:%%{tl_version}-%%{tl_release}\n");
if ( !strcmp(name, "xetex") ) {
fprintf(fpack, "Requires: teckit\n");

2
tlpdb.patch
View File

@ -1,5 +1,5 @@
--- texlive.tlpdb.orig 2013-06-01 08:42:24.769943751 +0200
+++ texlive.tlpdb 2013-06-01 08:42:24.822944088 +0200
+++ texlive.tlpdb 2013-06-12 14:53:37.749724366 +0200
@@ -76,7 +76,7 @@
catalogue-ctan /macros/latex/contrib/abc
catalogue-date 2008-03-08 20:47:21 +0100