Unify versioning, fix build and obsolete latexmk
This commit is contained in:
Jindrich Novy
parent
f33028144a
commit
2b7454df8e
16
texlive.spec
16
texlive.spec
|
|
@ -1,7 +1,8 @@
|
|||
%global source_date 20121024_r28063
|
||||
%global tl_version 2012
|
||||
%global tl_release 3.%{source_date}%{?dist}
|
||||
%global tl_noarch_release 1%{?dist}
|
||||
%global tl_rel 5
|
||||
%global tl_release %{tl_rel}.%{source_date}%{?dist}
|
||||
%global tl_noarch_release %{tl_rel}%{?dist}
|
||||
%global source_name texlive-%{source_date}-source
|
||||
|
||||
%{!?_texdir: %global _texdir %{_datadir}/%{name}}
|
||||
|
|
@ -39,7 +40,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: tl-lcdf-tests.patch
|
||||
Source0: %{source_name}.tar.xz
|
||||
Source1: tl2rpm.c
|
||||
Source2: texlive.tlpdb
|
||||
|
|
@ -173124,9 +173124,6 @@ distribution.
|
|||
xz -dc %{SOURCE0} | tar x
|
||||
[ -e %{source_name} ] && mv %{source_name} source
|
||||
%patch1 -p0
|
||||
%ifarch s390 s390x
|
||||
%patch2 -p0
|
||||
%endif
|
||||
for l in `unxz -c %{SOURCE3} | tar t`; do
|
||||
ln -s %{_texdir}/licenses/$l $l
|
||||
done
|
||||
|
|
@ -297865,9 +297862,14 @@ fi
|
|||
%{_libdir}/*.so
|
||||
|
||||
%changelog
|
||||
* Sun Nov 4 2012 Jindrich Novy <jnovy@redhat.com> 2012-5-20121024
|
||||
- don't conflict with latexmk (#868996)
|
||||
- unify versioning for both binary and noarch subpackages
|
||||
- remove lcdf-typetools hack for s390(x)
|
||||
|
||||
* Wed Oct 24 2012 Jindrich Novy <jnovy@redhat.com> 2012-3-20121024
|
||||
- sync with upstream - fixes problem lcdf-typetools tests
|
||||
- disable largefile support to fix pdflatex on 32bit arches
|
||||
- disable largefile support to fix pdflatex on 32bit arches (#872231)
|
||||
- put compatibility TEXMF tree reference into texm-local instead
|
||||
symlinking it to /usr/share/texmf directly
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
%global source_date 20121024_r28063
|
||||
%global tl_version 2012
|
||||
%global tl_release 3.%{source_date}%{?dist}
|
||||
%global tl_noarch_release 1%{?dist}
|
||||
%global tl_rel 5
|
||||
%global tl_release %{tl_rel}.%{source_date}%{?dist}
|
||||
%global tl_noarch_release %{tl_rel}%{?dist}
|
||||
%global source_name texlive-%{source_date}-source
|
||||
|
||||
%{!?_texdir: %global _texdir %{_datadir}/%{name}}
|
||||
|
|
@ -39,7 +40,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: tl-lcdf-tests.patch
|
||||
Source0: %{source_name}.tar.xz
|
||||
Source1: tl2rpm.c
|
||||
Source2: texlive.tlpdb
|
||||
|
|
@ -101,9 +101,6 @@ distribution.
|
|||
xz -dc %{SOURCE0} | tar x
|
||||
[ -e %{source_name} ] && mv %{source_name} source
|
||||
%patch1 -p0
|
||||
%ifarch s390 s390x
|
||||
%patch2 -p0
|
||||
%endif
|
||||
for l in `unxz -c %{SOURCE3} | tar t`; do
|
||||
ln -s %{_texdir}/licenses/$l $l
|
||||
done
|
||||
|
|
@ -308,9 +305,14 @@ fi
|
|||
%{_libdir}/*.so
|
||||
|
||||
%changelog
|
||||
* Sun Nov 4 2012 Jindrich Novy <jnovy@redhat.com> 2012-5-20121024
|
||||
- don't conflict with latexmk (#868996)
|
||||
- unify versioning for both binary and noarch subpackages
|
||||
- remove lcdf-typetools hack for s390(x)
|
||||
|
||||
* Wed Oct 24 2012 Jindrich Novy <jnovy@redhat.com> 2012-3-20121024
|
||||
- sync with upstream - fixes problem lcdf-typetools tests
|
||||
- disable largefile support to fix pdflatex on 32bit arches
|
||||
- disable largefile support to fix pdflatex on 32bit arches (#872231)
|
||||
- put compatibility TEXMF tree reference into texm-local instead
|
||||
symlinking it to /usr/share/texmf directly
|
||||
|
||||
|
|
|
|||
|
|
@ -1,69 +0,0 @@
|
|||
diff -up source/texk/lcdf-typetools/tests/t1.test.dh source/texk/lcdf-typetools/tests/t1.test
|
||||
--- source/texk/lcdf-typetools/tests/t1.test.dh 2012-10-26 04:49:59.088000800 -0400
|
||||
+++ source/texk/lcdf-typetools/tests/t1.test 2012-10-26 04:56:16.187518476 -0400
|
||||
@@ -35,16 +35,16 @@ cat uhv_dl.pfb | $LCDF_TYPETOOLS_TREE/t1
|
||||
&& echo "t1testpage/bin tests OK" \
|
||||
|| failed="$failed t1testpage/bin"
|
||||
|
||||
-$LCDF_TYPETOOLS_TREE/t1reencode/t1reencode -e $srcdir/tests/t2c.enc -a $srcdir/tests/uhvrrc8a.pfb uhv_re.tmp \
|
||||
- && grep -v 'Created by t1reencode' uhv_re.tmp >uhv_re.pfa \
|
||||
- && diff uhv_re.pfa $srcdir/tests/uhv_re.pfa \
|
||||
- && echo "t1reencode/asc tests OK" \
|
||||
- || failed="$failed t1reencode/asc"
|
||||
+#$LCDF_TYPETOOLS_TREE/t1reencode/t1reencode -e $srcdir/tests/t2c.enc -a $srcdir/tests/uhvrrc8a.pfb uhv_re.tmp \
|
||||
+# && grep -v 'Created by t1reencode' uhv_re.tmp >uhv_re.pfa \
|
||||
+# && diff uhv_re.pfa $srcdir/tests/uhv_re.pfa \
|
||||
+# && echo "t1reencode/asc tests OK" \
|
||||
+# || failed="$failed t1reencode/asc"
|
||||
|
||||
-$LCDF_TYPETOOLS_TREE/t1rawafm/t1rawafm -o uhv_re_a.afm uhv_re.pfa \
|
||||
- && diff uhv_re_a.afm $srcdir/tests/uhv_re.afm \
|
||||
- && echo "t1rawafm/asc tests OK" \
|
||||
- || failed="$failed t1rawafm/asc"
|
||||
+#$LCDF_TYPETOOLS_TREE/t1rawafm/t1rawafm -o uhv_re_a.afm uhv_re.pfa \
|
||||
+# && diff uhv_re_a.afm $srcdir/tests/uhv_re.afm \
|
||||
+# && echo "t1rawafm/asc tests OK" \
|
||||
+# || failed="$failed t1rawafm/asc"
|
||||
|
||||
cat $srcdir/tests/uhvrrc8a.pfb | $LCDF_TYPETOOLS_TREE/t1reencode/t1reencode -e $srcdir/tests/t2c.enc -b \
|
||||
| $LCDF_TYPETOOLS_TREE/t1rawafm/t1rawafm >uhv_re_b.afm \
|
||||
diff -up source/texk/lcdf-typetools/tests/tfm.test.dh source/texk/lcdf-typetools/tests/tfm.test
|
||||
--- source/texk/lcdf-typetools/tests/tfm.test.dh 2012-10-26 04:52:30.917871470 -0400
|
||||
+++ source/texk/lcdf-typetools/tests/tfm.test 2012-10-26 04:53:27.037982086 -0400
|
||||
@@ -3,6 +3,8 @@
|
||||
# Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
|
||||
# You may freely use, modify and/or distribute this file.
|
||||
|
||||
+exit 0
|
||||
+
|
||||
PATH=$LCDF_TYPETOOLS_TREE/cfftot1:$PATH # May need to run cfftot1, ...
|
||||
PATH=$LCDF_TYPETOOLS_TREE/t1dotlessj:$PATH # ... t1dotlessj, ...
|
||||
PATH=$LCDF_TYPETOOLS_TREE/ttftotype42:$PATH # ... or ttftotype42.
|
||||
diff -up source/texk/lcdf-typetools/tests/ttf.test.dh source/texk/lcdf-typetools/tests/ttf.test
|
||||
--- source/texk/lcdf-typetools/tests/ttf.test.dh 2012-10-26 04:54:04.687828373 -0400
|
||||
+++ source/texk/lcdf-typetools/tests/ttf.test 2012-10-26 04:54:46.548053820 -0400
|
||||
@@ -17,15 +17,15 @@ cat $srcdir/tests/texmfhome.otf | $LCDF_
|
||||
&& echo "cfftot1/bin tests OK" \
|
||||
|| failed="$failed cfftot1/bin"
|
||||
|
||||
-$LCDF_TYPETOOLS_TREE/ttftotype42/ttftotype42 $srcdir/tests/FonetikaDaniaIwonaeBold.ttf Fon_f.t42 \
|
||||
- && diff Fon_f.t42 $srcdir/tests/Fon.t42 \
|
||||
- && echo "ttftotype42/file tests OK" \
|
||||
- || failed="$failed ttftotype42/file"
|
||||
-
|
||||
-cat $srcdir/tests/FonetikaDaniaIwonaeBold.ttf | $LCDF_TYPETOOLS_TREE/ttftotype42/ttftotype42 >Fon_t.t42 \
|
||||
- && diff Fon_t.t42 $srcdir/tests/Fon.t42 \
|
||||
- && echo "ttftotype42/term tests OK" \
|
||||
- || failed="$failed ttftotype42/term"
|
||||
+#$LCDF_TYPETOOLS_TREE/ttftotype42/ttftotype42 $srcdir/tests/FonetikaDaniaIwonaeBold.ttf Fon_f.t42 \
|
||||
+# && diff Fon_f.t42 $srcdir/tests/Fon.t42 \
|
||||
+# && echo "ttftotype42/file tests OK" \
|
||||
+# || failed="$failed ttftotype42/file"
|
||||
+
|
||||
+#cat $srcdir/tests/FonetikaDaniaIwonaeBold.ttf | $LCDF_TYPETOOLS_TREE/ttftotype42/ttftotype42 >Fon_t.t42 \
|
||||
+# && diff Fon_t.t42 $srcdir/tests/Fon.t42 \
|
||||
+# && echo "ttftotype42/term tests OK" \
|
||||
+# || failed="$failed ttftotype42/term"
|
||||
|
||||
$LCDF_TYPETOOLS_TREE/otfinfo/otfinfo -t $srcdir/tests/texmfhome.otf >tmf.tables \
|
||||
&& diff tmf.tables $srcdir/tests/tmf.tables \
|
||||
Loading…
Reference in New Issue