automatic import of copr-rpmbuild

2 files changed, 13 insertions, 31 deletions

diff --git a/.gitignore b/.gitignore
index 1d5dbef..0a65a91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/copr-rpmbuild-0.64.tar.gz
-/copr-rpmbuild-git-47.a93386c.tar.gz
-/copr-rpmbuild-0.66.tar.gz
 /copr-rpmbuild-0.68.tar.gz
diff --git a/copr-rpmbuild.spec b/copr-rpmbuild.spec
index cb46975..f63a81f 100644
--- a/copr-rpmbuild.spec
+++ b/copr-rpmbuild.spec
@@ -1,4 +1,4 @@
-%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?openEuler}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %global __python        %__python3
 %global python          python3
 %global python_pfx      python3
@@ -51,8 +51,6 @@ BuildRequires: python3-backoff >= 1.9.0
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: argparse-manpage
-%elif 0%{?openEuler}
-BuildRequires: python3-argparse-manpage
 %endif
 BuildRequires: python-rpm-macros
 
@@ -75,9 +73,7 @@ Requires: git
 Requires: git-svn
 # for the /bin/unbuffer binary
 Requires: expect
-%if !0%{?openEuler}
 Requires: qemu-user-static
-%endif
 Requires: sed
 
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -107,7 +103,7 @@ Requires: dnf-yum
 Requires: dnf-utils
 %endif
 # selinux toolset to allow running ansible against the builder
-%if 0%{?fedora} || 0%{?openEuler}
+%if 0%{?fedora}
 Requires: python3-libselinux
 Requires: python3-libsemanage
 %else
@@ -118,25 +114,21 @@ Requires: libsemanage-python
 Requires: nosync
 %ifarch x86_64
 # multilib counterpart to avoid: config_opts['nosync_force'] = True
-%if !0%{?openEuler}
 Requires: nosync(x86-32)
 %endif
-%endif
 Requires: openssh-clients
 Requires: podman
-%if !0%{?openEuler}
 Requires: pyp2rpm
 Requires: pyp2spec
-Requires: rubygem-gem2rpm
-Requires: scl-utils-build
-Requires: fedora-review >= 0.8
-Requires: fedora-review-plugin-java
-%endif
 # We need %%pypi_source defined, which is in 3-29+
 Requires: python-srpm-macros >= 3-29
 Requires: rpkg
 Requires: rsync
+Requires: rubygem-gem2rpm
+Requires: scl-utils-build
 Requires: tito
+Requires: fedora-review >= 0.8
+Requires: fedora-review-plugin-java
 # yum* to allow mock to build against el* chroots without bootstrap_container
 %if 0%{?rhel}
 Requires: yum
@@ -146,14 +138,8 @@ Requires: yum-utils
 # We want those to be always up-2-date
 %latest_requires ca-certificates
 %latest_requires distribution-gpg-keys
-%if 0%{?fedora} || 0%{?openEuler}
-
-%if 0%{?fedora} >= 38
-%latest_requires dnf5
-%latest_requires dnf5-plugins
-%endif
-
-%latest_requires python3-dnf
+%if 0%{?fedora}
+%latest_requires dnf
 %latest_requires dnf-plugins-core
 %latest_requires libdnf
 %latest_requires librepo
@@ -161,13 +147,12 @@ Requires: yum-utils
 %endif
 %latest_requires mock
 %latest_requires mock-core-configs
-%if !0%{?openEuler}
 %latest_requires redhat-rpm-config
-%else
-%latest_requires openEuler-rpm-config
-%endif
 %latest_requires rpm
 
+# Outdated gem2rpm version may have problems with fetching from rubygems.org
+%latest_requires rubygem-gem2rpm
+
 
 %description -n copr-builder
 Provides command capable of running COPR build-tasks.
@@ -291,7 +276,7 @@ install -p -m 755 copr-update-builder %buildroot%_bindir
 )
 
 install -p -m 755 bin/copr-distgit-client %buildroot%_bindir
-%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?openEuler}
+%if 0%{?fedora} || 0%{?rhel} > 7
 argparse-manpage --pyfile copr_distgit_client.py \
     --function _get_argparser \
     --author "Copr Team" \
@@ -339,7 +324,7 @@ install -p -m 644 copr_distgit_client.py %{buildroot}%{expand:%%%{python}_siteli
 %files -n copr-distgit-client
 %license LICENSE
 %_bindir/copr-distgit-client
-%if 0%{?fedora} || 0%{?rhel} > 7 || 0%{?openEuler}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %_mandir/man1/copr-distgit-client.1*
 %endif
 %dir %_sysconfdir/copr-distgit-client