From 7e4e611dfacb446bbcaa2462f43472e9466b43dc Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: May 14 2019 05:05:01 +0000
Subject: Update to new version


This mostly brings a more complete copr-builder package.

Version: 0.26-1

---

diff --git a/.gitignore b/.gitignore
index 708bc68..9f975f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1 @@
-/copr-rpmbuild-0.6.tar.gz
-/copr-rpmbuild-0.7.tar.gz
-/copr-rpmbuild-0.8.tar.gz
-/copr-rpmbuild-0.9.tar.gz
-/copr-rpmbuild-0.10.tar.gz
-/copr-rpmbuild-0.11.tar.gz
-/copr-rpmbuild-0.12.tar.gz
-/copr-rpmbuild-0.13.tar.gz
-/copr-rpmbuild-0.15.tar.gz
-/copr-rpmbuild-0.16.tar.gz
-/copr-rpmbuild-git-8.d6c2925.tar.gz
-/copr-rpmbuild-0.17.tar.gz
-/copr-rpmbuild-0.18.tar.gz
-/copr-rpmbuild-0.19.tar.gz
-/copr-rpmbuild-0.20.tar.gz
-/copr-rpmbuild-0.21.tar.gz
-/copr-rpmbuild-0.22.tar.gz
-/copr-rpmbuild-0.24.tar.gz
-/copr-rpmbuild-0.25.tar.gz
+/copr-rpmbuild-*.tar.gz
diff --git a/copr-rpmbuild.spec b/copr-rpmbuild.spec
index d1a0772..0f05757 100644
--- a/copr-rpmbuild.spec
+++ b/copr-rpmbuild.spec
@@ -10,8 +10,12 @@
 %global rpm_python      rpm-python
 %endif
 
+%define latest_requires() \
+Requires: %1 \
+%{expand: %%global latest_requires_packages %1 %%{?latest_requires_packages}}
+
 Name:    copr-rpmbuild
-Version: 0.25
+Version: 0.26
 Summary: Run COPR build tasks
 Release: 1%{?dist}
 URL: https://pagure.io/copr/copr
@@ -20,12 +24,16 @@ BuildArch: noarch
 
 # Source is created by:
 # git clone https://pagure.io/copr/copr.git
-# git checkout copr-rpmbuild-0.25
+# git checkout copr-rpmbuild-0.26
 # cd copr/rpmbuild
 # rpkg spec --sources
-Source0: copr-rpmbuild-0.25.tar.gz
+Source0: copr-rpmbuild-0.26.tar.gz
 
 BuildRequires: %{python}-devel
+BuildRequires: %{python}-distro
+%if 0%{?rhel} == 0 || 0%{?rhel} != 6
+BuildRequires: %{python}-httmock
+%endif
 BuildRequires: %{rpm_python}
 BuildRequires: asciidoc
 BuildRequires: %{python}-setuptools
@@ -51,6 +59,7 @@ Requires: %{python_pfx}-simplejson
 Requires: mock
 Requires: git
 Requires: git-svn
+# for the /bin/unbuffer binary
 Requires: expect
 
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -66,14 +75,53 @@ Provides command capable of running COPR build-tasks.
 Example: copr-rpmbuild 12345-epel-7-x86_64 will locally
 build build-id 12345 for chroot epel-7-x86_64.
 
+
 %package -n copr-builder
 Summary: copr-rpmbuild with all weak dependencies
 Requires: %{name} = %{version}-%{release}
+
+%if 0%{?fedora}
+# replacement for yum/yum-utils, to be able to work with el* chroots
+# bootstrap_container.
+Requires: dnf-yum
+Requires: dnf-utils
+%endif
+# selinux toolset to allow running ansible against the builder
+%if 0%{?fedora}
+Requires: python3-libselinux
+Requires: python3-libsemanage
+%else
+Requires: libselinux-python
+Requires: libsemanage-python
+%endif
+# for mock to allow 'nosync = True'
+Requires: nosync
+Requires: openssh-clients
+Requires: pyp2rpm
+# We need %%pypi_source defined, which is in 3-29+
+Requires: python-srpm-macros >= 3-29
 Requires: rpkg
-Requires: tito
+Requires: rsync
 Requires: rubygem-gem2rpm
-Requires: pyp2rpm
-Requires: python-srpm-macros
+Requires: scl-utils-build
+Requires: tito
+# yum* to allow mock to build against el* chroots without bootstrap_container
+%if 0%{?rhel}
+Requires: yum
+Requires: yum-utils
+%endif
+
+# We want those to be always up-2-date
+%latest_requires ca-certificates
+%latest_requires distribution-gpg-keys
+%if 0%{?fedora}
+%latest_requires dnf
+%latest_requires dnf-plugins-core
+%endif
+%latest_requires mock
+%latest_requires mock-core-configs
+%latest_requires rpm
+
 
 %description -n copr-builder
 Provides command capable of running COPR build-tasks.
@@ -82,16 +130,30 @@ build build-id 12345 for chroot epel-7-x86_64.
 
 This package contains all optional modules for building SRPM.
 
+
 %prep
 %setup -q
 
+
 %check
 PYTHON=%{python} ./run_tests.sh
 
+
 %build
 name="%{name}" version="%{version}" summary="%{summary}" %py_build
 a2x -d manpage -f manpage man/copr-rpmbuild.1.asciidoc
 
+cat > copr-update-builder <<EOF
+#! /bin/sh
+
+# Update the Copr builder machine, can be called anytime Copr build system
+# decides to do so (please keep the output idempotent).
+
+# install the latest versions of those packages
+dnf update -y %latest_requires_packages
+EOF
+
+
 %install
 install -d %{buildroot}%{_sysconfdir}/copr-rpmbuild
 install -d %{buildroot}%{_sharedstatedir}/copr-rpmbuild
@@ -111,6 +173,9 @@ install -p -m 755 bin/copr-sources-custom %buildroot%_bindir
 
 name="%{name}" version="%{version}" summary="%{summary}" %py_install
 
+install -p -m 755 copr-update-builder %buildroot%_bindir
+
+
 %files
 %{!?_licensedir:%global license %doc}
 %license LICENSE
@@ -132,8 +197,19 @@ name="%{name}" version="%{version}" summary="%{summary}" %py_install
 
 %files -n copr-builder
 %license LICENSE
+%_bindir/copr-update-builder
+
 
 %changelog
+* Tue May 14 2019 Pavel Raiskup <praiskup@redhat.com> 0.26-1
+- [rpmbuild] ansible_python_interpreter: /usr/bin/python3
+- [rpmbuild] install dnf-utils instead of yum-utils on Fedora
+- [rpmbuild] builder: document some of the requires
+- [rpmbuild] builder: merge dependencies from playbooks
+- [rpmbuild] don't define %%_disable_source_fetch
+- [rpmbuild] use six.moves.urllib.parse
+- [rpmbuild] download srpm/spec if url contains query string
+
 * Wed Apr 24 2019 Jakub Kadlčík <frostyx@email.cz> 0.25-1
 - remove dependency on python3-configparser
 
diff --git a/sources b/sources
index 2e92d85..040f89b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (copr-rpmbuild-0.25.tar.gz) = 739f1dc1aa0640b9de823e37d633faf4a9726a0d531d580bafbff5737be2a59ed5a00bf77d950e0ad122ed9f246ecd5cc3b5ef26cd162b65d3cf2f8cfad94ca2
+SHA512 (copr-rpmbuild-0.26.tar.gz) = 11b9426ef7df4f8e3c2d666d3d195aeecca63e02a739e94bc317366fbad17b8fa30de1cf139175d4235566c3fc2d0c4f145d7de952e3e201754eb4c7bbdc12da