From ec645898e341e850024d3f9763bd4144d8dbc7c77648aaca694b2aab23927c8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 11 Dec 2019 08:20:56 +0000
Subject: [PATCH] - Require full python for sqlite module

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pymilter?expand=0&rev=8
---
 python-pymilter.changes |  5 +++++
 python-pymilter.spec    | 30 +++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/python-pymilter.changes b/python-pymilter.changes
index 4598fec..1436cb4 100644
--- a/python-pymilter.changes
+++ b/python-pymilter.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Dec 11 08:19:51 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Require full python for sqlite module
+
 -------------------------------------------------------------------
 Thu Apr 25 08:37:53 UTC 2019 - pgajdos@suse.com
 
diff --git a/python-pymilter.spec b/python-pymilter.spec
index 3db6eaf..2474db2 100644
--- a/python-pymilter.spec
+++ b/python-pymilter.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pymilter
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 # Copyright (c) 2018 Neal Gompa <ngompa13@gmail.com>.
 #
 # All modifications and additions to the file contributed by third parties
@@ -19,34 +19,33 @@
 
 # we don't want to provide private python extension libs
 %global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$
-
 # Python 2 module isn't building properly and we don't really need it right now anyway...
 %global skip_python2 1
-
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Summary:        Python interface to the sendmail milter API
-License:        GPL-2.0-or-later
-Group:          Development/Languages/Python
 Name:           python-pymilter
 Version:        1.0.4
 Release:        0
+Summary:        Python interface to the sendmail milter API
+License:        GPL-2.0-or-later
 URL:            http://www.bmsi.com/python/milter.html
 Source0:        https://github.com/sdgathman/pymilter/archive/pymilter-%{version}.tar.gz
 Source1:        tmpfiles-python-pymilter.conf
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{pythons}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  sendmail-devel >= 8.13
 BuildRequires:  systemd-rpm-macros
-%if "%{python_flavor}" == "python2"
-Requires:       python2-pydns
-%endif
-%if "%{python_flavor}" == "python3"
-Requires:       python3-py3dns
-%endif
 # Common subpackage named as such to avoid creating flavor packages
 Requires:       pymilter-common = %{version}-%{release}
+Requires:       python
+%ifpython2
+Requires:       python2-pydns
+%endif
+%ifpython3
+Requires:       python3-py3dns
+%endif
 %python_subpackages
 
 %description
@@ -56,9 +55,8 @@ navigation and modification of MIME parts, sending DSNs, and doing CBV.
 
 %package -n pymilter-common
 Summary:        Common files for pymilter
-Group:          Development/Languages/Python
-BuildArch:      noarch
 Requires(post): systemd
+BuildArch:      noarch
 
 %description -n pymilter-common
 This package contains the common files used for pymilter.
@@ -80,9 +78,7 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %fdupes %{buildroot}%{python_sitearch}/*
 
 %check
-%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch}
-$python -m unittest discover
-}
+%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} $python -m unittest discover -v
 
 %files %{python_files}
 %doc README ChangeLog NEWS TODO CREDITS sample.py milter-template.py