From 16551915bf04bfbb2ec2a41dece16e3b72eba187 Mon Sep 17 00:00:00 2001
From: Marco Strigl <marco.strigl@suse.com>
Date: Wed, 24 Apr 2019 09:57:40 +0000
Subject: [PATCH] - simplify "BuildArch:" decission if statements. (Avoid
 double   BuildArch lines) - Fedora29: m2crypto for python3 is named
 python3-m2crypto now

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=283
---
 osc.changes |  7 +++++++
 osc.spec    | 11 +++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osc.changes b/osc.changes
index 097ced8..6513dfb 100644
--- a/osc.changes
+++ b/osc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 24 09:55:14 UTC 2019 - Marco Strigl <marco.strigl@suse.com>
+
+- simplify "BuildArch:" decission if statements. (Avoid double
+  BuildArch lines)
+- Fedora29: m2crypto for python3 is named python3-m2crypto now
+
 -------------------------------------------------------------------
 Thu Apr 18 12:45:04 UTC 2019 - Marco Strigl <marco.strigl@suse.com>
 
diff --git a/osc.spec b/osc.spec
index 57159bd..cf6eae6 100644
--- a/osc.spec
+++ b/osc.spec
@@ -55,10 +55,10 @@ BuildRequires:  rpm-python
 Requires:       rpm-python
 %endif
 %endif
-%if 0%{?suse_version}
-%if 0%{?suse_version} >= 1120
+%if 0%{?suse_version} == 0 || 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
+%if 0%{?suse_version}
 Requires:       %{use_python}
 Recommends:     %{use_python}-progressbar
 BuildRequires:  %{use_python}-xml
@@ -83,8 +83,6 @@ Recommends:     obs-service-download_files
 Recommends:     obs-service-format_spec_file
 Recommends:     obs-service-source_validator
 %endif
-%else
-BuildArch:      noarch
 %endif
 # needed for storing credentials in kwallet/gnome-keyring
 %if 0%{?suse_version} > 1000 || 0%{?mandriva_version} || 0%{?mdkversion}
@@ -109,9 +107,14 @@ BuildRequires:  python-m2crypto > 0.19
 Requires:       python-m2crypto > 0.19
 %endif
 %else
+%if 0%{?fedora_version} >= 29
+BuildRequires:  python3-m2crypto
+Requires:       python3-m2crypto
+%else
 BuildRequires:  m2crypto > 0.19
 Requires:       m2crypto > 0.19
 %endif
+%endif
 %if %{with python3}
 %define python_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
 %else