From 6ab90b6085ee569b600b2f3529d2d140692ce39ea7c65a10124e4a6901888f44 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 11 Apr 2023 12:19:20 +0000 Subject: [PATCH 1/9] error trap for testing OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=439 --- texlive.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/texlive.spec b/texlive.spec index 6ed93a1..59529ba 100644 --- a/texlive.spec +++ b/texlive.spec @@ -4302,6 +4302,18 @@ popd PATH=$prefix/bin:$PATH \ TEXMFLOCAL=%{_texmfmaindir} \ TEXMFCNF=$texmfcnf \ + + testsuite () { + test -s ${world}/bibtex-x/test-suite.log || return + cat ${world}/bibtex-x/test-suite.log + for log in ${world}/bibtex-x/tests/*.log + do + echo $log + cat $log + done + } + trap "testsuite" ERR + make %{?_smp_mflags} world STRIP=/bin/true STRIPPROG=/bin/true popd From 5bc1de860b260b6dee7417fac93db8d9cdd66c8b2b4bfe3c32f007b5768a8d08 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 11 Apr 2023 13:11:08 +0000 Subject: [PATCH 2/9] error trap for testing, 2nd OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=440 --- texlive.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/texlive.spec b/texlive.spec index 59529ba..f8cc47a 100644 --- a/texlive.spec +++ b/texlive.spec @@ -4315,6 +4315,8 @@ popd trap "testsuite" ERR make %{?_smp_mflags} world STRIP=/bin/true STRIPPROG=/bin/true + + trap 'rm -vf %{options}' ERR popd pushd utils/asymptote From 74bcc75b0e91f7277b1b74e2775839fa34f76c5d20d047259fdaa075d51bcd3b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 11 Apr 2023 13:14:52 +0000 Subject: [PATCH 3/9] error trap for testing, 3th OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=441 --- texlive.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/texlive.spec b/texlive.spec index f8cc47a..2234ed1 100644 --- a/texlive.spec +++ b/texlive.spec @@ -4317,6 +4317,7 @@ popd make %{?_smp_mflags} world STRIP=/bin/true STRIPPROG=/bin/true trap 'rm -vf %{options}' ERR + unset testsuite popd pushd utils/asymptote From ae0a8bd390486027836f388f4f159c1a4bd949726ebfc0bfde20663e7507d3e1 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 12 Apr 2023 06:03:06 +0000 Subject: [PATCH 4/9] error trap for testing, 4th OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=442 --- texlive.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/texlive.spec b/texlive.spec index 2234ed1..77dbb85 100644 --- a/texlive.spec +++ b/texlive.spec @@ -4302,7 +4302,7 @@ popd PATH=$prefix/bin:$PATH \ TEXMFLOCAL=%{_texmfmaindir} \ TEXMFCNF=$texmfcnf \ - + ( testsuite () { test -s ${world}/bibtex-x/test-suite.log || return cat ${world}/bibtex-x/test-suite.log @@ -4315,9 +4315,8 @@ popd trap "testsuite" ERR make %{?_smp_mflags} world STRIP=/bin/true STRIPPROG=/bin/true + ) - trap 'rm -vf %{options}' ERR - unset testsuite popd pushd utils/asymptote From 3473a8efb61d3136be6428198c959b3bbaec2630029033bf6d1107b647f15e2a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 12 Apr 2023 06:45:07 +0000 Subject: [PATCH 5/9] error trap for testing, 5th OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=443 --- texlive.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/texlive.spec b/texlive.spec index 77dbb85..28811e7 100644 --- a/texlive.spec +++ b/texlive.spec @@ -4299,10 +4299,6 @@ popd --with-xdvi-x-toolkit=xaw3d \ --with-editor='vi +%%d %%s' - PATH=$prefix/bin:$PATH \ - TEXMFLOCAL=%{_texmfmaindir} \ - TEXMFCNF=$texmfcnf \ - ( testsuite () { test -s ${world}/bibtex-x/test-suite.log || return cat ${world}/bibtex-x/test-suite.log @@ -4311,11 +4307,16 @@ popd echo $log cat $log done + rm -vf %{options} } trap "testsuite" ERR + PATH=$prefix/bin:$PATH \ + TEXMFLOCAL=%{_texmfmaindir} \ + TEXMFCNF=$texmfcnf \ make %{?_smp_mflags} world STRIP=/bin/true STRIPPROG=/bin/true - ) + + trap 'rm -vf %{options}' ERR popd From 75a5558e68e439eba76c9d3ddd21d430538829b756786ad76e2b2177632f345f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 12 Apr 2023 07:35:11 +0000 Subject: [PATCH 6/9] error trap for testing, sixth OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=444 --- texlive.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/texlive.spec b/texlive.spec index 28811e7..d627a78 100644 --- a/texlive.spec +++ b/texlive.spec @@ -4300,9 +4300,9 @@ popd --with-editor='vi +%%d %%s' testsuite () { - test -s ${world}/bibtex-x/test-suite.log || return - cat ${world}/bibtex-x/test-suite.log - for log in ${world}/bibtex-x/tests/*.log + test -s ${world}/texk/bibtex-x/test-suite.log || return + cat ${world}/texk/bibtex-x/test-suite.log + for log in ${world}/texk/bibtex-x/tests/*.log do echo $log cat $log From 20e8939504d9823e2fa09296beae67c4c89062fd40f239f0fcd8e2415e761531 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 12 Apr 2023 08:44:21 +0000 Subject: [PATCH 7/9] changelog for ERR trap OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=445 --- texlive.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/texlive.changes b/texlive.changes index 917c86e..285cba1 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 12 08:42:24 UTC 2023 - Dr. Werner Fink + +- Use ERR trap in bash used by spec file to catch rare and random + bibtexu/bibtex8 FAILS + ------------------------------------------------------------------- Wed Apr 5 08:24:31 UTC 2023 - Dr. Werner Fink From bfd1b6786a85d306b4b585825cd2cb6716d5a58f791564f8606439806e93d94a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 12 Apr 2023 13:53:38 +0000 Subject: [PATCH 8/9] Do not build nor test bibtex8/bibtexu in parallel OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=446 --- source.dif | 14 +++++++++++++- texlive.changes | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/source.dif b/source.dif index b633b3c..2f6ed01 100644 --- a/source.dif +++ b/source.dif @@ -1,6 +1,7 @@ --- libs/icu/icu-src/source/common/Makefile.in | 2 reautoconf | 2 + texk/bibtex-x/Makefile.in | 2 texk/dviljk/dvi2xx.c | 11 texk/kpathsea/c-fopen.h | 6 texk/kpathsea/c-memstr.h | 3 @@ -21,7 +22,7 @@ texk/web2c/window/x11-Xt.c | 4 texk/xdvik/psgs.c | 22 + texk/xdvik/xdvi-sh.in | 19 + - 22 files changed, 224 insertions(+), 83 deletions(-) + 23 files changed, 225 insertions(+), 84 deletions(-) --- reautoconf +++ reautoconf 2022-04-05 13:46:43.207504121 +0000 @@ -45,6 +46,17 @@ # for icu data location ifeq ($(PKGDATA_MODE),common) +--- texk/bibtex-x/Makefile.in ++++ texk/bibtex-x/Makefile.in 2023-04-12 13:47:24.619293127 +0000 +@@ -13,7 +13,7 @@ + # PARTICULAR PURPOSE. + + @SET_MAKE@ +- ++.NOTPARALLEL: + + VPATH = @srcdir@ + am__is_gnu_make = { \ --- texk/dviljk/dvi2xx.c +++ texk/dviljk/dvi2xx.c 2021-04-07 10:14:44.206880772 +0000 @@ -168,7 +168,18 @@ main(int argc, char *argv[]) diff --git a/texlive.changes b/texlive.changes index 285cba1..a1bb726 100644 --- a/texlive.changes +++ b/texlive.changes @@ -2,7 +2,8 @@ Wed Apr 12 08:42:24 UTC 2023 - Dr. Werner Fink - Use ERR trap in bash used by spec file to catch rare and random - bibtexu/bibtex8 FAILS + bibtexu/bibtex8 FAILS +- Do not build nor test bibtex8/bibtexu in parallel ------------------------------------------------------------------- Wed Apr 5 08:24:31 UTC 2023 - Dr. Werner Fink From 1a69a2406484e472bc148e0909763ab245309af5bd92924c028d0e016fae32b8 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 17 Apr 2023 09:58:51 +0000 Subject: [PATCH 9/9] Really update biber to version 2.19 (boo#1210257) OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=447 --- biber-2.18.tar.gz | 3 --- biber-2.19.tar.gz | 3 +++ texlive.changes | 5 +++++ texlive.spec | 28 ++++++++++++++-------------- 4 files changed, 22 insertions(+), 17 deletions(-) delete mode 100644 biber-2.18.tar.gz create mode 100644 biber-2.19.tar.gz diff --git a/biber-2.18.tar.gz b/biber-2.18.tar.gz deleted file mode 100644 index 3ebd3fe..0000000 --- a/biber-2.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b966cf9b35a92ce9a705fec7930baab8dc2bfaf9a9f311cdb92393640222c844 -size 1619235 diff --git a/biber-2.19.tar.gz b/biber-2.19.tar.gz new file mode 100644 index 0000000..7238884 --- /dev/null +++ b/biber-2.19.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c1266bc8adb1637c4c59e23c47d919c5a38da4e53544a3c22c21de4a68fc9fe +size 1634803 diff --git a/texlive.changes b/texlive.changes index a1bb726..d068b19 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 17 09:28:07 UTC 2023 - Dr. Werner Fink + +- Really update biber to version 2.19 (boo#1210257) + ------------------------------------------------------------------- Wed Apr 12 08:42:24 UTC 2023 - Dr. Werner Fink diff --git a/texlive.spec b/texlive.spec index d627a78..b18e4ea 100644 --- a/texlive.spec +++ b/texlive.spec @@ -19,9 +19,9 @@ %define texlive_version 2023 %define texlive_previous 2022 %define texlive_release 20230311 -%define texlive_noarch 201 +%define texlive_noarch 202 %define texlive_source texlive-20230311-source -%define biber_version 2.18 +%define biber_version 2.19 %define __perl_requires %{nil} %define __os_install_post /usr/lib/rpm/brp-compress \\\ @@ -4299,24 +4299,24 @@ popd --with-xdvi-x-toolkit=xaw3d \ --with-editor='vi +%%d %%s' - testsuite () { - test -s ${world}/texk/bibtex-x/test-suite.log || return - cat ${world}/texk/bibtex-x/test-suite.log - for log in ${world}/texk/bibtex-x/tests/*.log - do - echo $log - cat $log - done - rm -vf %{options} - } - trap "testsuite" ERR + testsuite () { + test -s ${world}/texk/bibtex-x/test-suite.log || return + cat ${world}/texk/bibtex-x/test-suite.log + for log in ${world}/texk/bibtex-x/tests/*.log + do + echo $log + cat $log + done + rm -vf %{options} + } + trap "testsuite" ERR PATH=$prefix/bin:$PATH \ TEXMFLOCAL=%{_texmfmaindir} \ TEXMFCNF=$texmfcnf \ make %{?_smp_mflags} world STRIP=/bin/true STRIPPROG=/bin/true - trap 'rm -vf %{options}' ERR + trap 'rm -vf %{options}' ERR popd