Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2022-07-07 12:57:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave" Thu Jul 7 12:57:25 2022 rev:77 rq:987298 version:7.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/octave/octave.changes 2022-07-05 20:13:51.566744347 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new.1523/octave.changes 2022-07-07 12:57:44.983357704 +0200 @@ -1,0 +2,6 @@ +Wed Jul 6 23:44:18 UTC 2022 - Stefan Br??ns <stefan.bru...@rwth-aachen.de> + +- Fix build of external packages when trying to unlink + non-existent files, add fix_build_unlink_failed.patch + +------------------------------------------------------------------- New: ---- fix_build_unlink_failed.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave.spec ++++++ --- /var/tmp/diff_new_pack.B63Ct1/_old 2022-07-07 12:57:45.743358835 +0200 +++ /var/tmp/diff_new_pack.B63Ct1/_new 2022-07-07 12:57:45.747358840 +0200 @@ -63,6 +63,8 @@ Patch0: octave_tools_pie.patch # PATCH-FIX-UPSTREAM - https://savannah.gnu.org/bugs/?54607 Patch1: 0001-Disable-signal-handler-thread-avoid-duplicate-signal.patch +# PATCH-FIX-UPSTREAM - https://savannah.gnu.org/bugs/?func=detailitem&item_id=62436 +Patch2: https://hg.savannah.gnu.org/hgweb/octave/raw-rev/6e91c61f626f#/fix_build_unlink_failed.patch BuildRequires: arpack-ng-devel # Required for Patch0 BuildRequires: autoconf @@ -217,8 +219,7 @@ %prep %setup -q -n %{name}-%{src_ver} -%patch0 -p1 -%patch1 -p1 +%autopatch -p1 %build ++++++ fix_build_unlink_failed.patch ++++++ # HG changeset patch # User John Donoghue <john.donog...@ieee.org> # Date 1652358904 14400 # Node ID 6e91c61f626f3067640e6f55fcf2f646031313db # Parent 4f2f81989d50b760046364037b816bd794f8f3e2 pkg: Avoid error when unlinking non-existent files (bug #62436). * scripts/pkg/private/build.m: Check configure and Makefile exist before trying to unlink them. diff --git a/scripts/pkg/private/build.m b/scripts/pkg/private/build.m --- a/scripts/pkg/private/build.m +++ b/scripts/pkg/private/build.m @@ -77,8 +77,12 @@ else arch_abi = getarch (); configure_make (desc, build_root, verbose); - unlink (fullfile (build_root, "src", "configure")); - unlink (fullfile (build_root, "src", "Makefile")); + if exist (fullfile (build_root, "src", "configure"), "file") + unlink (fullfile (build_root, "src", "configure")); + endif + if exist (fullfile (build_root, "src", "Makefile"), "file") + unlink (fullfile (build_root, "src", "Makefile")); + endif endif tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"]; tar_path = fullfile (builddir, tar_name);
