From ec10b40af39ccf2beade7808bb13cf2d7022fe2e Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Dec 04 2019 13:39:44 +0000 Subject: Update copr-rpmbuild to 0.32-1 --- diff --git a/0001-rpmbuild-fix-custom-method-for-F31-s-systemd.patch b/0001-rpmbuild-fix-custom-method-for-F31-s-systemd.patch deleted file mode 100644 index c248aaf..0000000 --- a/0001-rpmbuild-fix-custom-method-for-F31-s-systemd.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0e5d74de539e226a28d00e203cfdde347d51c3dd Mon Sep 17 00:00:00 2001 -From: Pavel Raiskup -Date: Fri, 29 Nov 2019 18:03:03 +0100 -Subject: [PATCH] rpmbuild: fix custom method for F31's systemd - -Use 'mock --copyin' rather than "mock --shell 'cat -'" for copying files -into mock buildroot. This is bugfix caused by changed systemd-nspawn's -in F31, see https://github.com/rpm-software-management/mock/issues/432. - -Fixes: #1123 ---- - rpmbuild/bin/copr-sources-custom | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rpmbuild/bin/copr-sources-custom b/rpmbuild/bin/copr-sources-custom -index 6729288b..5eda4e12 100755 ---- a/rpmbuild/bin/copr-sources-custom -+++ b/rpmbuild/bin/copr-sources-custom -@@ -80,7 +80,7 @@ if __name__ == "__main__": - pkgs = args.builddeps.split() - run_cmd(mock + ['--install'] + pkgs) - -- run_cmd(mock + ['--shell', 'cat - > /script'], stdin=args.script) -+ run_cmd(mock + ['--copyin', args.script.name, '/script']) - - setup_cmd = 'set -ex; chmod a+x /script;' - -@@ -94,8 +94,8 @@ if __name__ == "__main__": - - if args.hook_payload_file: - payload_file_inner = "{0}/hook_payload".format(pipes.quote(workdir)) -- run_cmd(mock + ['--shell', 'cat - > ' + payload_file_inner], -- stdin=args.hook_payload_file) -+ run_cmd(mock + ['--copyin', args.hook_payload_file.name, -+ os.path.join(workdir, 'hook_payload')]) - run_cmd(mock + ['--shell', 'chmod a+r ' + payload_file_inner]) - - cmd = 'set -xe ; cd {workdir} ; {env} /script'.format( --- -2.23.0 - diff --git a/copr-rpmbuild.spec b/copr-rpmbuild.spec index 442f6b4..c09883b 100644 --- a/copr-rpmbuild.spec +++ b/copr-rpmbuild.spec @@ -18,9 +18,9 @@ Requires: %1 \ %{expand: %%global latest_requires_packages %1 %%{?latest_requires_packages}} Name: copr-rpmbuild -Version: 0.31 +Version: 0.32 Summary: Run COPR build tasks -Release: 4%{?dist} +Release: 1%{?dist} URL: https://pagure.io/copr/copr License: GPLv2+ @@ -29,8 +29,6 @@ License: GPLv2+ # tito build --tgz --tag %%name-%%version-%%release Source0: %name-%version.tar.gz -Patch0: 0001-rpmbuild-fix-custom-method-for-F31-s-systemd.patch - BuildRequires: %{python}-devel BuildRequires: %{python}-distro %if 0%{?rhel} == 0 || 0%{?rhel} != 6 @@ -63,6 +61,7 @@ Requires: git Requires: git-svn # for the /bin/unbuffer binary Requires: expect +Requires: qemu-user-static %if 0%{?fedora} || 0%{?rhel} > 7 Recommends: rpkg @@ -140,7 +139,7 @@ This package contains all optional modules for building SRPM. %prep -%autosetup -p2 +%setup -q %check @@ -209,14 +208,12 @@ install -p -m 755 copr-update-builder %buildroot%_bindir %changelog -* Fri Nov 29 2019 Pavel Raiskup - 0.31-4 -- bugfix for https://pagure.io/copr/copr/issue/1123 - -* Thu Oct 03 2019 Miro Hrončok - 0.31-3 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 0.31-2 -- Rebuilt for Python 3.8 +* Wed Dec 04 2019 Pavel Raiskup 0.32-1 +- fix custom method for F31's nspawn (--console=pipe is not default) +- buildrequires: add qemu-user-static for building armhfp +- module_hotfixes support +- define %%copr_username again on copr builders +- skip_if_unavailable=False for copr_base * Wed Jul 31 2019 Pavel Raiskup 0.31-1 - rpmbuild: make sure librepo/libdnf is always up2date diff --git a/sources b/sources index d3d26e6..4301ce4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (copr-rpmbuild-0.31.tar.gz) = 15b5e3dc8c6096eee91e6a11000ec3d27a349f074b27769aaa1f6b22c09ae002eb492846f139b6c80649643a7ae28afeca5a0eb4e4bb100d36cc96db87a51a31 +SHA512 (copr-rpmbuild-0.32.tar.gz) = c5fb784fea1e1f035cc01dbe0c1a8033c4859db251c09e1b07d2634f1dd5ec35e46654eebf42496d0f2d9e9b1db64b6e5f8666ffba8fdb0b6ab2ad317f403f12