diff --git a/texlive.spec b/texlive.spec index 76f5ae4..5aa8cd7 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,6 +1,6 @@ %global source_date 20150728_r37987 %global tl_version 2015 -%global tl_rel 14 +%global tl_rel 15 %global tl_release %{tl_rel}.%{source_date}%{?dist} %global tl_noarch_release %{tl_rel}%{?dist} %global source_name texlive-%{source_date}-source @@ -280900,7 +280900,7 @@ 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-system-freetype2 --with-system-poppler --with-system-zziplib --with-system-cairo --with-system-icu --with-system-harfbuzz --with-system-graphite2 --with-system-libgs --with-system-pixman --with-system-libpaper --with-system-potrace --with-pic --with-xdvi-x-toolkit=xaw --with-system-mpfr --with-system-gmp --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 --disable-largefile \ -%ifarch %{power64} s390 s390x +%ifarch aarch64 %{power64} s390 s390x --disable-luajittex --disable-mfluajit \ %endif --disable-rpath @@ -300039,7 +300039,7 @@ fi %defattr(-,root,root) %doc gpl2.txt %{_bindir}/dviluatex -%ifarch %{ix86} x86_64 %arm aarch64 +%ifnarch aarch64 %{power64} s390 s390x %{_bindir}/luajittex %endif %{_bindir}/luatex @@ -443371,13 +443371,16 @@ fi %{_includedir}/kpathsea/* %{_includedir}/synctex/ %{_includedir}/texlua52/ -%ifarch %{ix86} x86_64 %arm aarch64 +%ifnarch aarch64 %{power64} s390 s390x %{_includedir}/texluajit/ %endif %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog +* Wed Nov 25 2015 Peter Robinson 5:2015-15.20150728_r37987 +- Actually fix secondary arches (no luajit on aarch64 either) + * Mon Nov 16 2015 Than Ngo - 5:2015-14.20150728_r37987 - fix build failure on secondary arch