[texlive] Fix largefile support, build tests and non-TL style package compatibility
Jindrich Novy
jnovy at fedoraproject.org
Wed Oct 24 19:45:43 UTC 2012
commit 78c90c100627615359347081e1b79ae8fbfb6f4d
Author: Jindrich Novy <jnovy at redhat.com>
Date: Wed Oct 24 21:49:03 2012 +0200
Fix largefile support, build tests and non-TL style package compatibility
texlive-badtest.patch | 9 ---------
texlive.spec | 26 ++++++++++++++++----------
texlive.spec.template | 25 +++++++++++++++----------
3 files changed, 31 insertions(+), 29 deletions(-)
---
diff --git a/texlive.spec b/texlive.spec
index 60f2382..61a18c9 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,4 +1,4 @@
-%global source_date 20121019_r28030
+%global source_date 20121024_r28063
%global tl_version 2012
%global tl_release 3.%{source_date}%{?dist}
%global tl_noarch_release 1%{?dist}
@@ -39,7 +39,6 @@ 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: texlive-badtest.patch
Source0: %{source_name}.tar.xz
Source1: tl2rpm.c
Source2: texlive.tlpdb
@@ -173124,19 +173123,18 @@ distribution.
xz -dc %{SOURCE0} | tar x
[ -e %{source_name} ] && mv %{source_name} source
%patch1 -p0
-%patch2 -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"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+export CXXFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
cd source
PREF=`pwd`/inst
mkdir -p work
cd work
-../configure --prefix=$PREF --datadir=$PREF --libdir=$PREF/lib --with-system-zlib --with-system-libpng --with-system-xpdf --with-system-gd --with-system-t1lib --with-system-teckit --with-teckit-includes=/usr/include/teckit --with-system-freetype2 --with-system-poppler --with-system-zziplib --with-system-icu --with-pic --with-xdvi-x-toolkit=xaw --disable-xindy --disable-xindy-docs --disable-xindy-make-rules --enable-shared --enable-compiler-warnings=max --without-cxx-runtime-hack --disable-native-texlive-build --disable-t1utils --disable-psutils --disable-biber --disable-ptexenc
+../configure --prefix=$PREF --datadir=$PREF --libdir=$PREF/lib --with-system-zlib --with-system-libpng --with-system-xpdf --with-system-gd --with-system-t1lib --with-system-teckit --with-system-freetype2 --with-system-poppler --with-system-zziplib --with-system-icu --with-pic --with-xdvi-x-toolkit=xaw --disable-xindy --disable-xindy-docs --disable-xindy-make-rules --enable-shared --enable-compiler-warnings=max --without-cxx-runtime-hack --disable-native-texlive-build --disable-t1utils --disable-psutils --disable-biber --disable-ptexenc
make world %{?_smp_mflags} STRIPPROG=/bin/true STRIP=/bin/true
@@ -173148,8 +173146,9 @@ mkdir -p %{buildroot}%{_texdir}/../texmf
mkdir -p %{buildroot}%{_texdir}/texmf-config/web2c
mkdir -p %{buildroot}%{_texmf_var}
mkdir -p %{buildroot}%{_texdir}/texmf-dist
-pushd %{buildroot}%{_texdir}
-ln -s ../texmf texmf-local
+mkdir -p %{buildroot}%{_texdir}/texmf-local
+pushd %{buildroot}%{_texdir}/texmf-local
+ln -s ../../texmf texmf-compat
popd
xz -dc %{SOURCE100} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE101} | tar x -C %{buildroot}%{_texdir}/texmf-dist
@@ -177701,7 +177700,7 @@ 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 dosepsbin mkjobtexmf texdiff texdirflatten; do
+for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog dosepsbin mkjobtexmf texdiff texdirflatten adhocfilelist; do
rm -f %{buildroot}%{_bindir}/$i
done
rm -rf %{buildroot}%{_includedir}/ptexenc
@@ -177948,6 +177947,7 @@ fi
%dir %{_texdir}/../texmf
%dir %{_texdir}/licenses
%dir %{_texdir}/texmf-local
+%dir %{_texdir}/texmf-local/texmf-compat
%dir %{_texdir}/
%dir %{_texdir}/readme-html.dir
%dir %{_texdir}/readme-txt.dir
@@ -297861,11 +297861,17 @@ fi
%{_libdir}/*.so
%changelog
+* Wed Oct 24 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20121024
+- sync with upstream - fixes problem lcdf-typetools tests
+- attempt to fix largefile support problem on 32bit arches
+- put compatibility TEXMF tree reference into texm-local instead
+symlinking it to /usr/share/texmf directly
+
* Fri Oct 19 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20121019
- sync with upstream sources
- make /usr/share/texmf visible to kpathsea, make texmf-local
pointing to it (#867656, #864875)
-- fix versioning of binaty packages
+- fix versioning of binary packages
* Tue Oct 9 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20120926
- obsolete chktex (#864211)
diff --git a/texlive.spec.template b/texlive.spec.template
index 0196e9c..1966e5c 100644
--- a/texlive.spec.template
+++ b/texlive.spec.template
@@ -1,4 +1,4 @@
-%global source_date 20121019_r28030
+%global source_date 20121024_r28063
%global tl_version 2012
%global tl_release 3.%{source_date}%{?dist}
%global tl_noarch_release 1%{?dist}
@@ -39,7 +39,6 @@ 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: texlive-badtest.patch
Source0: %{source_name}.tar.xz
Source1: tl2rpm.c
Source2: texlive.tlpdb
@@ -101,14 +100,13 @@ distribution.
xz -dc %{SOURCE0} | tar x
[ -e %{source_name} ] && mv %{source_name} source
%patch1 -p0
-%patch2 -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"
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
+export CXXFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
cd source
PREF=`pwd`/inst
mkdir -p work
@@ -123,7 +121,6 @@ cd work
--with-system-gd \
--with-system-t1lib \
--with-system-teckit \
---with-teckit-includes=/usr/include/teckit \
--with-system-freetype2 \
--with-system-poppler \
--with-system-zziplib \
@@ -150,8 +147,9 @@ mkdir -p %{buildroot}%{_texdir}/../texmf
mkdir -p %{buildroot}%{_texdir}/texmf-config/web2c
mkdir -p %{buildroot}%{_texmf_var}
mkdir -p %{buildroot}%{_texdir}/texmf-dist
-pushd %{buildroot}%{_texdir}
-ln -s ../texmf texmf-local
+mkdir -p %{buildroot}%{_texdir}/texmf-local
+pushd %{buildroot}%{_texdir}/texmf-local
+ln -s ../../texmf texmf-compat
popd
%include _mkdirs.spec
%include _unpack.spec
@@ -214,7 +212,7 @@ 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 dosepsbin mkjobtexmf texdiff texdirflatten; do
+for i in physe phyzzx installfont-tl pdfthumb ppower4 tcdialog dosepsbin mkjobtexmf texdiff texdirflatten adhocfilelist; do
rm -f %{buildroot}%{_bindir}/$i
done
rm -rf %{buildroot}%{_includedir}/ptexenc
@@ -281,6 +279,7 @@ fi
%dir %{_texdir}/../texmf
%dir %{_texdir}/licenses
%dir %{_texdir}/texmf-local
+%dir %{_texdir}/texmf-local/texmf-compat
%include _dirs.spec
%{_texdir}/licenses/*
%attr(0644, root, root) %verify(not md5 size mtime) %ghost %{_texdir}/texmf/ls-R
@@ -304,11 +303,17 @@ fi
%{_libdir}/*.so
%changelog
+* Wed Oct 24 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20121024
+- sync with upstream - fixes problem lcdf-typetools tests
+- attempt to fix largefile support problem on 32bit arches
+- put compatibility TEXMF tree reference into texm-local instead
+ symlinking it to /usr/share/texmf directly
+
* Fri Oct 19 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20121019
- sync with upstream sources
- make /usr/share/texmf visible to kpathsea, make texmf-local
pointing to it (#867656, #864875)
-- fix versioning of binaty packages
+- fix versioning of binary packages
* Tue Oct 9 2012 Jindrich Novy <jnovy at redhat.com> 2012-3-20120926
- obsolete chktex (#864211)
More information about the scm-commits
mailing list