From 1708d79bbf247f29bd93b7209e4605e150d8fb1408b52b2408784193c8178132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 19 Jan 2024 10:37:16 +0000 Subject: [PATCH 1/3] fedora dep fixes OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=506 --- build.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.spec b/build.spec index a72189a..29983c9 100644 --- a/build.spec +++ b/build.spec @@ -53,8 +53,9 @@ BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) %if 0%{?fedora} -Requires: perl-MD5 Requires: perl-TimeDate +Requires: perl(LWP-Protocol-https) +Requires: perl(XML::Parser) BuildRequires: perl-TimeDate %endif Conflicts: bsdtar < 2.5.5 From 0f1c1171e00e304475b8d561d077c99ed3721ac89509f35813569813359ac736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 24 Jan 2024 09:46:25 +0000 Subject: [PATCH 2/3] use generic requirement perl(LWP::Protocol::https) OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=507 --- build.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.spec b/build.spec index 29983c9..6d489ba 100644 --- a/build.spec +++ b/build.spec @@ -54,7 +54,7 @@ BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) %if 0%{?fedora} Requires: perl-TimeDate -Requires: perl(LWP-Protocol-https) +Requires: perl(LWP::Protocol::https) Requires: perl(XML::Parser) BuildRequires: perl-TimeDate %endif From ead5834cf42d12b2d39b467068881a6d12fcc565df733dd5925030475e350d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 21 Feb 2024 15:06:25 +0000 Subject: [PATCH 3/3] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=508 --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 16 ++++++++++++++++ build.dsc | 2 +- build.spec | 9 ++------- debian.changelog | 2 +- obs-build-20240111.tar.gz | 3 --- obs-build-20240221.tar.gz | 3 +++ 8 files changed, 26 insertions(+), 15 deletions(-) delete mode 100644 obs-build-20240111.tar.gz create mode 100644 obs-build-20240221.tar.gz diff --git a/PKGBUILD b/PKGBUILD index f808e35..c13475e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20240111 +pkgver=20240221 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index d9fca8a..bcf7401 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20240111 - 20240111 + 20240221 + 20240221 https://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 14e4e80..09a3f98 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Feb 21 11:55:13 UTC 2024 - Adrian Schröter + +- ProductCompose: multiple improvements +- Add buildflags:define_specfile support +- Fix copy-in of git subdirectory sources +- pbuild: Speed up XML parsing +- pubild: product compose support +- generate_sbom: add help option +- podman: enforce runtime=runc +- Implement direct conflicts from the distro config +- changelog2spec: fix time zone handling +- Do not unmount /proc/sys/fs/binfmt_misc before runnint the check scripts +- spec file cleanup +- documentation updates + ------------------------------------------------------------------- Thu Jan 11 10:23:46 UTC 2024 - Adrian Schröter diff --git a/build.dsc b/build.dsc index af9d000..3069699 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20240111 +Version: 20240221 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 6d489ba..7b21ef2 100644 --- a/build.spec +++ b/build.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package build # # Copyright (c) 2024 SUSE LLC # @@ -28,7 +28,7 @@ Name: %{__pkg_name} Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-only OR GPL-3.0-only Group: Development/Tools/Building -Version: 20240111 +Version: 20240221 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,14 +73,9 @@ BuildRequires: perl(YAML::LibYAML) # Perl helper scripts use them. Recommends: perl(Archive::Tar) Recommends: /sbin/mkfs.ext3 -Recommends: /sbin/mkfs.ext3 -Recommends: /usr/bin/qemu-kvm Recommends: /usr/bin/qemu-kvm Recommends: bsdtar -Recommends: bsdtar Recommends: qemu-linux-user -Recommends: qemu-linux-user -Recommends: zstd Recommends: zstd Recommends: perl(Config::IniFiles) Recommends: perl(Date::Language) diff --git a/debian.changelog b/debian.changelog index 37d7437..d366213 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20240111) unstable; urgency=low +build (20240221) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20240111.tar.gz b/obs-build-20240111.tar.gz deleted file mode 100644 index 53db049..0000000 --- a/obs-build-20240111.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d27eb2f6a4979e765186b6ac7a123c4f7dd25997ae3b113f2d7ea19e3cc08731 -size 698864 diff --git a/obs-build-20240221.tar.gz b/obs-build-20240221.tar.gz new file mode 100644 index 0000000..693a8b5 --- /dev/null +++ b/obs-build-20240221.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86a1ba26e0c12eaaadf3488573354b206499d3b25750b5651e55ccefd16abcab +size 705355