From d34d882bcb272c2087d1fe0a360648f57904b18777d65a5570389d069913b3bb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 4 Jan 2023 09:12:56 +0000 Subject: [PATCH 1/2] Accepting request 1044077 from home:dirkmueller:branches:Base:System - Add hook to delete x86_64 subarches - fix version in git OBS-URL: https://build.opensuse.org/request/show/1044077 OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=177 --- post-build-checks-84.87+git20221125.a8b2d0e.tar.xz | 3 --- post-build-checks-84.87+git20221221.7972874.tar.xz | 3 +++ post-build-checks.changes | 6 ++++++ post-build-checks.spec | 8 +++----- 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 post-build-checks-84.87+git20221125.a8b2d0e.tar.xz create mode 100644 post-build-checks-84.87+git20221221.7972874.tar.xz diff --git a/post-build-checks-84.87+git20221125.a8b2d0e.tar.xz b/post-build-checks-84.87+git20221125.a8b2d0e.tar.xz deleted file mode 100644 index 2b6995a..0000000 --- a/post-build-checks-84.87+git20221125.a8b2d0e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f985629a7be3f8e48db010f910696d567660fa3582b6b66bfdbb758dfd2c806a -size 32764 diff --git a/post-build-checks-84.87+git20221221.7972874.tar.xz b/post-build-checks-84.87+git20221221.7972874.tar.xz new file mode 100644 index 0000000..b88ebe3 --- /dev/null +++ b/post-build-checks-84.87+git20221221.7972874.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e2b69d52bfbfe62591eee28c5064ac46d860671c64344dbf0b441f7478e5348 +size 32956 diff --git a/post-build-checks.changes b/post-build-checks.changes index 987e505..b0f1383 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 21 12:42:57 UTC 2022 - Dirk Müller + +- Add hook to delete x86_64 subarches +- fix version in git + ------------------------------------------------------------------- Fri Nov 25 12:59:11 UTC 2022 - ro@suse.de diff --git a/post-build-checks.spec b/post-build-checks.spec index f9eae8e..ddf4af4 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -16,13 +16,11 @@ # -%define version_unconverted 84.87+git20221125.a8b2d0e - Name: post-build-checks Summary: post checks for build after rpms have been created License: GPL-2.0-or-later Group: Development/Tools/Building -Version: 84.87+git20221125.a8b2d0e +Version: 84.87+git20221221.7972874 Release: 0 PreReq: aaa_base PreReq: permissions @@ -39,7 +37,6 @@ URL: https://github.com/openSUSE/post-build-checks # Source0: %{name}-%{version}.tar.xz BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description some scripts to check for problems like test-installing the newly @@ -59,10 +56,12 @@ it may not be a good idea to install this to a running system: %install install -d $RPM_BUILD_ROOT/usr/lib/build/checks +install -d $RPM_BUILD_ROOT/usr/lib/build/post-mkbaselibs-checks install -d $RPM_BUILD_ROOT/usr/lib/build/checks-data install -d $RPM_BUILD_ROOT/usr/lib/build/helper install -d $RPM_BUILD_ROOT/usr/lib/build/finalize-system install -m 755 checks/* $RPM_BUILD_ROOT/usr/lib/build/checks +install -m 755 post-mkbaselibs-checks/* $RPM_BUILD_ROOT/usr/lib/build/post-mkbaselibs-checks install -m 644 checks-data/* $RPM_BUILD_ROOT/usr/lib/build/checks-data install -m 755 helper/* $RPM_BUILD_ROOT/usr/lib/build/helper install -m 755 finalize-system/* $RPM_BUILD_ROOT/usr/lib/build/finalize-system @@ -71,7 +70,6 @@ install -m 644 -D suse-ignored-rpaths.conf $RPM_BUILD_ROOT/etc/suse-ignored-rpat chmod 755 $RPM_BUILD_ROOT/usr/lib/build/checks-data/check* %files -%defattr(-, root, root) %license COPYING /usr/lib/build /etc/profile.d/suse-buildsystem.sh From d838525cd1da2d4b3476f3e57aee5d8c88cf9532d3c79f52b3c4e5ad1b96b410 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 6 Jan 2023 20:26:46 +0000 Subject: [PATCH 2/2] - Update to version 84.87+git20230106.3a359c5: * Only delete subarch packages if matching main arch exists OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=178 --- _servicedata | 2 +- post-build-checks-84.87+git20221221.7972874.tar.xz | 3 --- post-build-checks-84.87+git20230106.3a359c5.tar.xz | 3 +++ post-build-checks.changes | 6 ++++++ post-build-checks.spec | 4 ++-- 5 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 post-build-checks-84.87+git20221221.7972874.tar.xz create mode 100644 post-build-checks-84.87+git20230106.3a359c5.tar.xz diff --git a/_servicedata b/_servicedata index 063aba6..cac2141 100644 --- a/_servicedata +++ b/_servicedata @@ -4,4 +4,4 @@ 9a72096c56008474c812a087e25d6e84eb357297 https://github.com/openSUSE/post-build-checks.git - a8b2d0e5fda7010d8d1120e6be8ca3c038f3b78c \ No newline at end of file + 3a359c57f371bceb4ee3ef9e7ce97daa13a237b5 \ No newline at end of file diff --git a/post-build-checks-84.87+git20221221.7972874.tar.xz b/post-build-checks-84.87+git20221221.7972874.tar.xz deleted file mode 100644 index b88ebe3..0000000 --- a/post-build-checks-84.87+git20221221.7972874.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e2b69d52bfbfe62591eee28c5064ac46d860671c64344dbf0b441f7478e5348 -size 32956 diff --git a/post-build-checks-84.87+git20230106.3a359c5.tar.xz b/post-build-checks-84.87+git20230106.3a359c5.tar.xz new file mode 100644 index 0000000..dec05ab --- /dev/null +++ b/post-build-checks-84.87+git20230106.3a359c5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0145eb45c130b4173dbc3964f52922e33c673cab900320bf4e24f9728f136cb9 +size 32924 diff --git a/post-build-checks.changes b/post-build-checks.changes index b0f1383..8c299c8 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 06 20:25:08 UTC 2023 - dmueller@suse.com + +- Update to version 84.87+git20230106.3a359c5: + * Only delete subarch packages if matching main arch exists + ------------------------------------------------------------------- Wed Dec 21 12:42:57 UTC 2022 - Dirk Müller diff --git a/post-build-checks.spec b/post-build-checks.spec index ddf4af4..9b3a117 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -1,7 +1,7 @@ # # spec file for package post-build-checks # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: post-build-checks Summary: post checks for build after rpms have been created License: GPL-2.0-or-later Group: Development/Tools/Building -Version: 84.87+git20221221.7972874 +Version: 84.87+git20230106.3a359c5 Release: 0 PreReq: aaa_base PreReq: permissions