From 0fd4d6d0df2af7528989465cdb0de82e2e450420c7a63c4cbf6d114d3a67fb22 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 29 Jan 2018 09:26:13 +0000 Subject: [PATCH 1/4] For Leap 42.3 do not build with biber OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=269 --- texlive.changes | 5 +++++ texlive.spec | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/texlive.changes b/texlive.changes index fd43aa7..108bf02 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 29 09:20:27 UTC 2018 - werner@suse.de + +- For Leap 42.3 build without biber as the perl version does not fit + ------------------------------------------------------------------- Mon Jan 8 12:55:08 UTC 2018 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index 2588867..2877cd5 100644 --- a/texlive.spec +++ b/texlive.spec @@ -19,7 +19,7 @@ %define texlive_version 2017 %define texlive_previous 2016 %define texlive_release 20170520 -%define texlive_noarch 133 +%define texlive_noarch 136 %define texlive_source texlive-20170520-source %define __perl_requires %{nil} @@ -62,14 +62,12 @@ # architectures can be supported (in theory) and the final # perl dump binary is smaller # -%global with_buildbiber 1 -%bcond_with buildbiber +%bcond_without buildbiber # # lcdf-typetools -- is also available as the package lcdf-typetools # and therefore we may only require this external package -%global with_lcdf_typetools 1 -%bcond_with lcdf_typetools +%bcond_without lcdf_typetools Name: texlive Version: %{texlive_version}.%{texlive_release} From 2cc167347a57f1151e895a646b48f5fdd44f73fb639c512c99aaecc9abd01c4c Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 29 Jan 2018 11:25:17 +0000 Subject: [PATCH 2/4] Old perl no biber OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=270 --- texlive.spec | 86 +++++----------------------------------------------- 1 file changed, 7 insertions(+), 79 deletions(-) diff --git a/texlive.spec b/texlive.spec index 2877cd5..82a3376 100644 --- a/texlive.spec +++ b/texlive.spec @@ -154,9 +154,7 @@ BuildRequires: Mesa-devel BuildRequires: libpaper-devel BuildRequires: libpng-devel BuildRequires: libpoppler-devel -%if 0%{suse_version} > 1230 BuildRequires: libsigsegv-devel -%endif BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: mpfr-devel @@ -213,9 +211,6 @@ BuildRequires: perl(List::MoreUtils) >= 0.407 BuildRequires: perl(List::MoreUtils::XS) BuildRequires: perl(Log::Log4perl) BuildRequires: perl(Module::Build) -%if 0%{suse_version} <= 1230 -BuildRequires: perl(PAR::Packer) -%endif BuildRequires: perl(Package::DeprecationManager) BuildRequires: perl(Params::Util) BuildRequires: perl(Readonly::XS) @@ -3684,76 +3679,6 @@ fi LANG=en_US.UTF-8 \ BIBER_DEV_TESTS=1 \ ./Build test - -%if 0%{suse_version} <= 1230 - pushd blib - - (cat > biber.files)<<-'EOF' - ../data/biber-tool.conf;lib/Biber/biber-tool.conf - ../data/schemata/config.rnc;lib/Biber/config.rnc - ../data/schemata/config.rng;lib/Biber/config.rng - ../data/schemata/bcf.rnc;lib/Biber/bcf.rnc - ../data/schemata/bcf.rng;lib/Biber/bcf.rng - ../data/schemata/biblatexml.rnc;lib/Biber/biblatexml.rnc - ../data/schemata/biblatexml.rng;lib/Biber/biblatexml.rng - ../lib/Biber/LaTeX/recode_data.xml;lib/Biber/LaTeX/recode_data.xml - ../data/bcf.xsl;lib/Biber/bcf.xsl - ../data/latinkeys.txt;lib/Unicode/Collate/latinkeys.txt - %{perl_privlib}/Unicode/Collate/Locale;lib/Unicode/Collate/Locale - %{perl_privlib}/Unicode/Collate/CJK;lib/Unicode/Collate/CJK - %{perl_privlib}/Unicode/Collate/allkeys.txt;lib/Unicode/Collate/allkeys.txt - %{perl_privlib}/Unicode/Collate/keys.txt;lib/Unicode/Collate/keys.txt - %{perl_privlib}/PerlIO;lib/PerlIO - %{perl_archlib}/auto/PerlIO;lib/auto/PerlIO - %{perl_vendorlib}/Business/ISBN/RangeMessage.xml;lib/Business/ISBN/RangeMessage.xml - EOF - LD_LIBRARY_PATH=/%{_lib}:%{_libdir} \ - PAR_VERBATIM=1 \ - pp -I lib --dependent \ - --compress=7 \ - --module=deprecate \ - --module=Biber::Input::file::bibtex \ - --module=Biber::Input::file::biblatexml \ - --module=Biber::Input::file::ris \ - --module=Biber::Input::file::zoterordfxml \ - --module=Biber::Input::file::endnotexml \ - --module=Biber::Output::bibtex \ - --module=Biber::Output::biblatexml \ - --module=Pod::Simple::TranscodeSmart \ - --module=Pod::Simple::TranscodeDumb \ - --module=Encode::Byte \ - --module=Encode::CN \ - --module=Encode::CJKConstants \ - --module=Encode::EBCDIC \ - --module=Encode::Encoder \ - --module=Encode::GSM0338 \ - --module=Encode::Guess \ - --module=Encode::JP \ - --module=Encode::KR \ - --module=Encode::MIME::Header \ - --module=Encode::Symbol \ - --module=Encode::TW \ - --module=Encode::Unicode \ - --module=Encode::Unicode::UTF7 \ - --module=Encode::EUCJPASCII \ - --module=Encode::JIS2K \ - --module=Encode::HanExtra \ - --module=File::Find::Rule \ - --module=IO::Socket::SSL \ - --link=libbtparse.so \ - --link=libxml2.so \ - --link=libz.so \ - --link=libxslt.so \ - --link=libexslt.so \ - --link=libcrypto.so \ - --link=libssl.so \ - --addlist=biber.files \ - --cachedeps=scancache \ - --output=${prefix}/bin/biber \ - script/biber - install -m 0644 bindoc/biber.1 ${prefix}/share/man/man1/ - popd -%endif popd %endif @@ -3832,7 +3757,6 @@ fi # Biber support # %if %{with buildbiber} -%if 0%{suse_version} > 1230 pushd ../biblatex-biber-* ./Build install destdir=%{buildroot} chmod 0755 %{buildroot}%{_bindir}/biber @@ -3853,7 +3777,13 @@ fi sed -ri '\@/usr/(share|bin)/.*@d' texlive.files popd mv ../biblatex-biber-*/texlive.files perl-biber.files -%endif +%else + (cat %{buildroot}%{_bindir}/biber)<<-'EOF' + #!/bin/sh + echo No biber available due to old perl installation >&2 + exit 1 + EOF + chmod 0755 %{buildroot}%{_bindir}/biber %endif # @@ -5097,10 +5027,8 @@ rm -f /var/run/texlive/run-update %defattr(-,root,root,755) %if %{with buildbiber} -%if 0%{suse_version} > 1230 %files -n perl-biber -f perl-biber.files %defattr(-,root,root,755) %endif -%endif %changelog From d8199b75203543e28837c50ccb0e9ad35ce144ba1c6bea5e990934d9a28b10c3 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 29 Jan 2018 11:55:35 +0000 Subject: [PATCH 3/4] Old perl no biber, next try OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=271 --- texlive.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/texlive.spec b/texlive.spec index 82a3376..1bc4e32 100644 --- a/texlive.spec +++ b/texlive.spec @@ -3778,7 +3778,7 @@ fi popd mv ../biblatex-biber-*/texlive.files perl-biber.files %else - (cat %{buildroot}%{_bindir}/biber)<<-'EOF' + (cat > %{buildroot}%{_bindir}/biber)<<-'EOF' #!/bin/sh echo No biber available due to old perl installation >&2 exit 1 From 1edd3fb78332cfa8637a72e3ff1341700ce63373aaf2d37a28e5ade6c1d1c968 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 29 Jan 2018 14:51:48 +0000 Subject: [PATCH 4/4] Accepting request 570642 from home:sndirsch:branches:Publishing:TeXLive - removed unneeded 'BuildRequires: xorg-x11-util-devel' (bsc#1077489) OBS-URL: https://build.opensuse.org/request/show/570642 OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=272 --- texlive.changes | 5 +++++ texlive.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/texlive.changes b/texlive.changes index 108bf02..253e1cc 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 29 14:41:24 UTC 2018 - sndirsch@suse.com + +- removed unneeded 'BuildRequires: xorg-x11-util-devel' (bsc#1077489) + ------------------------------------------------------------------- Mon Jan 29 09:20:27 UTC 2018 - werner@suse.de diff --git a/texlive.spec b/texlive.spec index 1bc4e32..84c1c95 100644 --- a/texlive.spec +++ b/texlive.spec @@ -169,7 +169,6 @@ BuildConflicts: texinfo BuildRequires: unzip BuildRequires: xaw3d-devel BuildRequires: xorg-x11-devel -BuildRequires: xorg-x11-util-devel BuildRequires: xz BuildRequires: zip BuildRequires: zlib-devel