Run mtxrun only once per transaction (#865650)
- use -std=c++11 for all C++ apps in texlive to avoid symbol problems
This commit is contained in:
parent
fab44a75ca
commit
659f73fb0e
2
.gitignore
vendored
2
.gitignore
vendored
@ -5503,4 +5503,4 @@
|
|||||||
/12many.tar.xz
|
/12many.tar.xz
|
||||||
/2up.doc.tar.xz
|
/2up.doc.tar.xz
|
||||||
/2up.tar.xz
|
/2up.tar.xz
|
||||||
/texlive-20121107_r28202-source.tar.xz
|
/texlive-20121111_r28233-source.tar.xz
|
||||||
|
2
sources
2
sources
@ -5503,4 +5503,4 @@ d9b1e9be31680dc5cc834046e294b2fa zwpagelayout.tar.xz
|
|||||||
69ec0bac5187782998de2fcf864869ef 12many.tar.xz
|
69ec0bac5187782998de2fcf864869ef 12many.tar.xz
|
||||||
847ee7231fe605d1f1283f40c2782709 2up.doc.tar.xz
|
847ee7231fe605d1f1283f40c2782709 2up.doc.tar.xz
|
||||||
eadb8e1d91dfb3fdd2d50539a792123a 2up.tar.xz
|
eadb8e1d91dfb3fdd2d50539a792123a 2up.tar.xz
|
||||||
5cba826d713098ea53beea0fb64215d2 texlive-20121107_r28202-source.tar.xz
|
9b34cca2fb3bc8776e4c7b7d563f6907 texlive-20121111_r28233-source.tar.xz
|
||||||
|
6395
texlive.spec
6395
texlive.spec
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
%global source_date 20121024_r28063
|
%global source_date 20121111_r28233
|
||||||
%global tl_version 2012
|
%global tl_version 2012
|
||||||
%global tl_rel 5
|
%global tl_rel 7
|
||||||
%global tl_release %{tl_rel}.%{source_date}%{?dist}
|
%global tl_release %{tl_rel}.%{source_date}%{?dist}
|
||||||
%global tl_noarch_release %{tl_rel}%{?dist}
|
%global tl_noarch_release %{tl_rel}%{?dist}
|
||||||
%global source_name texlive-%{source_date}-source
|
%global source_name texlive-%{source_date}-source
|
||||||
@ -40,6 +40,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}
|
Obsoletes: texlive-texmf-errata-latex < %{tl_version}, texlive-texmf-errata-xetex < %{tl_version}
|
||||||
Conflicts: texlive-dvips = 2007
|
Conflicts: texlive-dvips = 2007
|
||||||
Patch1: tl-kpfix.patch
|
Patch1: tl-kpfix.patch
|
||||||
|
Patch2: texlive-stdc++11.patch
|
||||||
Source0: %{source_name}.tar.xz
|
Source0: %{source_name}.tar.xz
|
||||||
Source1: tl2rpm.c
|
Source1: tl2rpm.c
|
||||||
Source2: texlive.tlpdb
|
Source2: texlive.tlpdb
|
||||||
@ -101,13 +102,14 @@ distribution.
|
|||||||
xz -dc %{SOURCE0} | tar x
|
xz -dc %{SOURCE0} | tar x
|
||||||
[ -e %{source_name} ] && mv %{source_name} source
|
[ -e %{source_name} ] && mv %{source_name} source
|
||||||
%patch1 -p0
|
%patch1 -p0
|
||||||
|
%patch2 -p1
|
||||||
for l in `unxz -c %{SOURCE3} | tar t`; do
|
for l in `unxz -c %{SOURCE3} | tar t`; do
|
||||||
ln -s %{_texdir}/licenses/$l $l
|
ln -s %{_texdir}/licenses/$l $l
|
||||||
done
|
done
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
export CXXFLAGS="$RPM_OPT_FLAGS"
|
export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11"
|
||||||
cd source
|
cd source
|
||||||
PREF=`pwd`/inst
|
PREF=`pwd`/inst
|
||||||
mkdir -p work
|
mkdir -p work
|
||||||
@ -305,6 +307,14 @@ fi
|
|||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 10 2012 Jindrich Novy <jnovy@redhat.com> 2012-7-20121107
|
||||||
|
- run mtxrun only once per transaction (#865650), this considerably
|
||||||
|
speeds up installation time
|
||||||
|
|
||||||
|
* Wed Nov 7 2012 Jindrich Novy <jnovy@redhat.com> 2012-6-20121107
|
||||||
|
- use -std=c++11 for all C++ apps in texlive to avoid symbol problems
|
||||||
|
(thanks to Jakub Jelinek)
|
||||||
|
|
||||||
* Sun Nov 4 2012 Jindrich Novy <jnovy@redhat.com> 2012-5-20121024
|
* Sun Nov 4 2012 Jindrich Novy <jnovy@redhat.com> 2012-5-20121024
|
||||||
- don't conflict with latexmk (#868996)
|
- don't conflict with latexmk (#868996)
|
||||||
- unify versioning for both binary and noarch subpackages
|
- unify versioning for both binary and noarch subpackages
|
||||||
|
8
tl2rpm.c
8
tl2rpm.c
@ -1742,7 +1742,7 @@ void solve(char *name) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fprintf(fpack, "mkdir -p /var/run/texlive\ntouch /var/run/texlive/run-texhash\n");
|
fprintf(fpack, "mkdir -p /var/run/texlive\ntouch /var/run/texlive/run-texhash\ntouch /var/run/texlive/run-mtxrun\n");
|
||||||
if ( run_updmap ) fprintf(fpack, "touch /var/run/texlive/run-updmap\n");
|
if ( run_updmap ) fprintf(fpack, "touch /var/run/texlive/run-updmap\n");
|
||||||
if ( run_fmtutil ) fprintf(fpack, "touch /var/run/texlive/run-fmtutil\n");
|
if ( run_fmtutil ) fprintf(fpack, "touch /var/run/texlive/run-fmtutil\n");
|
||||||
fprintf(fpack, "fi\n:\n\n");
|
fprintf(fpack, "fi\n:\n\n");
|
||||||
@ -1754,7 +1754,7 @@ void solve(char *name) {
|
|||||||
fprintf(fpack, "[ -e /var/run/texlive/run-texhash ] && %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash\n");
|
fprintf(fpack, "[ -e /var/run/texlive/run-texhash ] && %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash\n");
|
||||||
if ( run_updmap ) fprintf(fpack, "[ -e /var/run/texlive/run-updmap ] && %%{_bindir}/updmap-sys --nohash --quiet &> /dev/null; rm -f /var/run/texlive/run-updmap\n");
|
if ( run_updmap ) fprintf(fpack, "[ -e /var/run/texlive/run-updmap ] && %%{_bindir}/updmap-sys --nohash --quiet &> /dev/null; rm -f /var/run/texlive/run-updmap\n");
|
||||||
if ( run_fmtutil ) fprintf(fpack, "[ -e /var/run/texlive/run-fmtutil ] && %%{_bindir}/fmtutil-sys --all &> /dev/null; rm -f /var/run/texlive/run-fmtutil\n");
|
if ( run_fmtutil ) fprintf(fpack, "[ -e /var/run/texlive/run-fmtutil ] && %%{_bindir}/fmtutil-sys --all &> /dev/null; rm -f /var/run/texlive/run-fmtutil\n");
|
||||||
fprintf(fpack, "[ -e /usr/bin/mtxrun ] && export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null\n");
|
fprintf(fpack, "[ -e /var/run/texlive/run-mtxrun ] && export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun\n");
|
||||||
fprintf(fpack, ":\n\n");
|
fprintf(fpack, ":\n\n");
|
||||||
} else if ( pkg[i].runfs ) {
|
} else if ( pkg[i].runfs ) {
|
||||||
#ifndef SRPMS
|
#ifndef SRPMS
|
||||||
@ -1762,7 +1762,7 @@ void solve(char *name) {
|
|||||||
#else
|
#else
|
||||||
fprintf(fpack, "%%post\n");
|
fprintf(fpack, "%%post\n");
|
||||||
#endif
|
#endif
|
||||||
fprintf(fpack, "mkdir -p /var/run/texlive\ntouch /var/run/texlive/run-texhash\n");
|
fprintf(fpack, "mkdir -p /var/run/texlive\ntouch /var/run/texlive/run-texhash\ntouch /var/run/texlive/run-mtxrun\n");
|
||||||
if ( pkg[i].has_info ) {
|
if ( pkg[i].has_info ) {
|
||||||
int k;
|
int k;
|
||||||
|
|
||||||
@ -1786,7 +1786,7 @@ void solve(char *name) {
|
|||||||
fprintf(fpack, "%%posttrans\n");
|
fprintf(fpack, "%%posttrans\n");
|
||||||
#endif
|
#endif
|
||||||
fprintf(fpack, "[ -e /var/run/texlive/run-texhash ] && [ -e %%{_bindir}/texhash ] && %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash\n");
|
fprintf(fpack, "[ -e /var/run/texlive/run-texhash ] && [ -e %%{_bindir}/texhash ] && %%{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash\n");
|
||||||
fprintf(fpack, "[ -e /usr/bin/mtxrun ] && export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null\n");
|
fprintf(fpack, "[ -e /var/run/texlive/run-mtxrun ] && export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf/web2c; export TEXMFCACHE=/var/lib/texmf; %%{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun\n");
|
||||||
fprintf(fpack, ":\n\n");
|
fprintf(fpack, ":\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- texlive.tlpdb.orig 2012-10-06 19:47:35.146269287 +0200
|
--- texlive.tlpdb.orig 2012-11-11 19:07:00.325102794 +0100
|
||||||
+++ texlive.tlpdb 2012-10-06 19:47:35.504264812 +0200
|
+++ texlive.tlpdb 2012-11-11 19:07:00.652102792 +0100
|
||||||
@@ -76,7 +76,7 @@
|
@@ -76,7 +76,7 @@
|
||||||
catalogue-ctan /macros/latex/contrib/abc
|
catalogue-ctan /macros/latex/contrib/abc
|
||||||
catalogue-date 2008-03-08 20:47:21 +0100
|
catalogue-date 2008-03-08 20:47:21 +0100
|
||||||
|
Loading…
Reference in New Issue
Block a user