Update to de1f6847223085dcdd177e02a7298c835fae12a3 to support Python3

Fixes RHBZ#1777623

Signed-off-by: Zamir SUN <sztsian@gmail.com>

.gitignore

@@ -1 +1,2 @@
 /ddiskit-3.6.tar.gz
+/ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz

ddiskit.spec

@@ -1,16 +1,32 @@
+# Use the forge macros to simplify packaging.
+# See https://fedoraproject.org/wiki/Forge-hosted_projects_packaging_automation 
+%global forgeurl https://github.com/orosp/ddiskit
+# When we no longer need to build against a git commit, 
+# Simply remove the commit variable and update the Version
+# Then forge will pick up the release
+%global commit de1f6847223085dcdd177e02a7298c835fae12a3
+
 Name:           ddiskit
 Version:        3.6
-Release:        5%{?dist}
+
+%forgemeta -i
+
+Release:        6%{?dist}
 Summary:        Tool for Red Hat Enterprise Linux Driver Update Disk creation
 
 License:        GPLv3
-URL:            https://github.com/orosp/ddiskit
-Source0:        https://github.com/orosp/ddiskit/archive/%{version}/%{name}-%{version}.tar.gz
+URL:            %{forgeurl}
+Source0:        %{forgesource}
 
 BuildArch:      noarch
 %if 0%{?fedora} >= 25
+%if 0%{?fedora} >= 30
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
+%else
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
+%endif
 %else
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
@@ -32,22 +48,40 @@ Driver Update Disks (DUD) used for providing new or updated out-of-tree
 kernel modules.
 
 %prep
-%autosetup -n %{name}-%{version}
+%forgesetup
 
 %build
+%if 0%{?fedora} >= 30
+sed -i "s|/usr/bin/python$|/usr/bin/python3|g" bin/ddiskit
+sed -i "s|/usr/bin/python$|/usr/bin/python3|g" setup.py
+%py3_build
+%else
 %py2_build
+%endif
 
 %install
+%if 0%{?fedora} >= 30
+%py3_install
+%else
 %py2_install
+%endif
 find %{buildroot} -size 0 -delete
 
 %check
+%if 0%{?fedora} >= 30
+%{__python3} setup.py test
+%else
 %{__python2} setup.py test
+%endif
 
 %files -n %{name}
 %doc README
 %license COPYING
+%if 0%{?fedora} >= 30
+%{python3_sitelib}/*
+%else
 %{python2_sitelib}/*
+%endif
 %{_bindir}/ddiskit
 %{_mandir}/man1/ddiskit.1*
 %{_datadir}/bash-completion/completions/ddiskit
@@ -66,6 +100,10 @@ find %{buildroot} -size 0 -delete
 %config(noreplace) /etc/ddiskit.config
 
 %changelog
+* Fri Nov 29 2019 Zamir SUN <zsun@fedoraproject.org> - 3.6-6.20191129gitde1f684
+- Update to Python3 support in de1f6847223085dcdd177e02a7298c835fae12a3
+- Fixes RHBZ#1777623
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (ddiskit-3.6.tar.gz) = ed1b4ffb4366e0c5f3f1a780fb0dfda6e9c9ac88840a2a66f2cbffc7ba25e96c0aeb12482e94e08253cb7571996f80aca45ff6fd494cdca35c68f06bd381b36b
+SHA512 (ddiskit-de1f6847223085dcdd177e02a7298c835fae12a3.tar.gz) = 1b3d7dc10ab85c4b3a876cf6afb530baf0d5dd260cfdb51a3ef3b2906f3f163f86c40f3c2d05114cf3fb0bf79120d446aff8c4589e321ac9b9fafc015104a006