From 2a4f45ce45fcbf3acca76dcba5c6eda227466b2b5376bd2709cd799651925ba4 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Thu, 22 Feb 2024 11:56:17 +0000 Subject: [PATCH 1/3] Accepting request 1149027 from home:dimstar:rpm4.20:h Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1149027 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=170 --- hdf5.changes | 5 +++++ hdf5.spec | 44 ++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/hdf5.changes b/hdf5.changes index 1365938..0c0ac9d 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 22 07:48:45 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Fri Feb 2 18:36:08 UTC 2024 - Atri Bhattacharya diff --git a/hdf5.spec b/hdf5.spec index 7d25bca..13c9cec 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -568,30 +568,30 @@ library packages. %prep %{?with_hpc: %hpc_debug} %setup -q -n %{pname}-%{version} -%patch0 -p1 -b .LD_LIBRARY_PATH -%patch2 -p0 -b .abort_unknown_host_config +%patch -P 0 -p1 -b .LD_LIBRARY_PATH +%patch -P 2 -p0 -b .abort_unknown_host_config %ifarch %arm -%patch4 -p0 -b .tests-arm +%patch -P 4 -p0 -b .tests-arm %endif -%patch5 -p1 -%patch6 -p1 -# %%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 -%patch106 -p1 -%patch107 -p1 -%patch108 -p1 -%patch109 -p1 -%patch110 -p1 -%patch111 -p1 -%patch112 -p1 -%patch113 -p1 +%patch -P 5 -p1 +%patch -P 6 -p1 +# %%patch -P 7 -p1 +%patch -P 8 -p1 +%patch -P 9 -p1 +%patch -P 10 -p1 +%patch -P 101 -p1 +%patch -P 102 -p1 +%patch -P 103 -p1 +%patch -P 104 -p1 +%patch -P 105 -p1 +%patch -P 106 -p1 +%patch -P 107 -p1 +%patch -P 108 -p1 +%patch -P 109 -p1 +%patch -P 110 -p1 +%patch -P 111 -p1 +%patch -P 112 -p1 +%patch -P 113 -p1 %if %{without hpc} # baselibs looks different for different flavors - generate it on the fly From ae05e1b29f3dc7d4e1bc0b36ca55085b47006b06685f9e6be30535c8a5514631 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Wed, 20 Mar 2024 02:37:15 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=171 --- hdf5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf5.spec b/hdf5.spec index 13c9cec..a60e7d7 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -326,7 +326,7 @@ Patch4: hdf5-1.8.10-tests-arm.patch Patch5: PPC64LE-Fix-long-double-handling.patch Patch6: hdf5-Remove-timestamps-from-binaries.patch # Could be ported but it's unknown if it's still needed -Patch7: hdf5-mpi.patch +#Patch7: hdf5-mpi.patch Patch8: Disable-phdf5-tests.patch Patch9: Fix-error-message-not-the-name-but-the-link-information-is-parsed.patch # Imported from Fedora, strip flags from h5cc wrapper From 17d2a01d102c5adf046c872efc4269992af0820670395576ae21b01239ab4b9e Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Thu, 21 Mar 2024 04:57:31 +0000 Subject: [PATCH 3/3] Accepting request 1159681 from home:badshah400:branches:science Work around bot rejection for unapplied Patch7. OBS-URL: https://build.opensuse.org/request/show/1159681 OBS-URL: https://build.opensuse.org/package/show/science/hdf5?expand=0&rev=172 --- hdf5.changes | 5 +++++ hdf5.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hdf5.changes b/hdf5.changes index 0c0ac9d..b598d29 100644 --- a/hdf5.changes +++ b/hdf5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 20 03:09:27 UTC 2024 - Atri Bhattacharya + +- Work around bot rejection for unapplied Patch7. + ------------------------------------------------------------------- Thu Feb 22 07:48:45 UTC 2024 - Dominique Leuenberger diff --git a/hdf5.spec b/hdf5.spec index a60e7d7..7e491e9 100644 --- a/hdf5.spec +++ b/hdf5.spec @@ -326,7 +326,7 @@ Patch4: hdf5-1.8.10-tests-arm.patch Patch5: PPC64LE-Fix-long-double-handling.patch Patch6: hdf5-Remove-timestamps-from-binaries.patch # Could be ported but it's unknown if it's still needed -#Patch7: hdf5-mpi.patch +Patch7: hdf5-mpi.patch Patch8: Disable-phdf5-tests.patch Patch9: Fix-error-message-not-the-name-but-the-link-information-is-parsed.patch # Imported from Fedora, strip flags from h5cc wrapper @@ -575,7 +575,10 @@ library packages. %endif %patch -P 5 -p1 %patch -P 6 -p1 -# %%patch -P 7 -p1 +# work around bot rejection for unapplied patch +%if 0 +%patch -P 7 -p1 +%endif %patch -P 8 -p1 %patch -P 9 -p1 %patch -P 10 -p1