From 563f55a41d37afb5694d430034850415aadeaf9c Mon Sep 17 00:00:00 2001
From: Daniel Mach <daniel.mach@suse.com>
Date: Mon, 28 Feb 2022 15:53:40 +0000
Subject: [PATCH] Accepting request 956576 from
 home:matthewdva:branches:openSUSE:Tools

Fedora and EPEL provide osc in their respective repositories.  However OSC is built with a custom SPEC file.  The goal of these changes is bring the packaging of OSC closer in both build systems.

If these changes are accepted, I plan to also submit the changes to Fedora.
  * Modified SPEC file to be more compatible with KOJI and COPR.
  ** Modified SPEC file to use python3 for CentOS/RHEL 7
  ** Modified SPEC file use fedora/rhel version macros.
  ** Changed perl to sed in %install section of SPEC file.
        Removes  PERL as an unofficial build dependence.  EPEL-9 build roots in MOCK may not include PERL

OBS-URL: https://build.opensuse.org/request/show/956576
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=356
---
 osc.changes |  9 +++++++++
 osc.spec    | 16 ++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/osc.changes b/osc.changes
index 4df0c8e..a5b13b7 100644
--- a/osc.changes
+++ b/osc.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Feb 22 01:21:11 UTC 2022 - Matthew Davis <opensuse@virtual.drop.net>
+
+- 0.175.1:
+  * Modified SPEC file to be more compatible with KOJI and COPR.
+  ** Modified SPEC file to use python3 for CentOS/RHEL 7
+  ** Modified SPEC file use fedora/rhel version macros.
+  ** Changed perl to sed in %install section of SPEC file.
+
 -------------------------------------------------------------------
 Thu Dec  2 08:18:20 UTC 2021 - Marco Strigl <marco.strigl@suse.com>
 
diff --git a/osc.spec b/osc.spec
index 97f7993..29074f5 100644
--- a/osc.spec
+++ b/osc.spec
@@ -16,7 +16,7 @@
 #
 
 
-%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 29 || 0%{?centos_version} >= 800 || 0%{?mageia} >= 8
+%if 0%{?suse_version} >= 1500 || 0%{?fedora} >= 29 || 0%{?rhel} >= 7 || 0%{?mageia} >= 8
 %bcond_without python3
 %else
 %bcond_with    python3
@@ -53,7 +53,7 @@ BuildRequires:  diffstat
 BuildRequires:  python-rpm
 Requires:       python-rpm
 %else
-%if 0%{?suse_version} >= 1500 || 0%{?fedora_version} >= 32 || 0%{?centos_version} >= 800
+%if 0%{?suse_version} >= 1500 || 0%{?fedora} >= 32 || 0%{?rhel} >= 7
 BuildRequires:  %{use_python}-rpm
 Requires:       %{use_python}-rpm
 %else
@@ -95,18 +95,14 @@ Conflicts:      build < 20200106
 %endif
 %endif
 # needed for storing credentials in kwallet/gnome-keyring
-%if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion}
+%if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion} || 0%{?fedora} >= 29 || 0%{rhel} >= 8
 %if %{with python3}
 Recommends:     python3-keyring
 %else
 Recommends:     python-keyring
 %endif
 %endif
-%if 0%{?rhel_version} && 0%{?rhel_version} < 600
-BuildRequires:  python-elementtree
-Requires:       python-elementtree
-%endif
-%if 0%{?centos_version} && 0%{?centos_version} < 600
+%if 0%{?rhel} && 0%{?rhel} < 6
 BuildRequires:  python-elementtree
 Requires:       python-elementtree
 %endif
@@ -121,7 +117,7 @@ BuildRequires:  python-m2crypto > 0.19
 Requires:       python-m2crypto > 0.19
 %endif
 %else
-%if 0%{?fedora_version} >= 29  || 0%{?centos_version} >= 800
+%if 0%{?fedora} >= 29  || 0%{?rhel} >= 7
 BuildRequires:  python3-m2crypto
 Requires:       python3-m2crypto
 %else
@@ -162,7 +158,7 @@ echo >> %{macros_file}
 
 %install
 %{use_python} setup.py install --prefix=%{_prefix} --root=%{buildroot}
-perl -p -i -e 's{#!.*python}{#!%{_bindir}/%{use_python}}' osc-wrapper.py
+sed -i -E 's|#!.*python|#!%{_bindir}/%{use_python}|' osc-wrapper.py
 ln -s osc-wrapper.py %{buildroot}/%{_bindir}/osc
 mkdir -p %{buildroot}%{osc_plugin_dir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/osc-plugins