Accepting request 628630 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/628630
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/binwalk?expand=0&rev=4

binwalk.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 10 13:00:35 UTC 2018 - tchvatal@suse.com
+
+- Use only python3 variant
+- Drop argparse dependency
+- Use %license macro
+
 -------------------------------------------------------------------
 Mon Jul  2 19:48:09 UTC 2018 - kstreitova@suse.com
 

binwalk.spec

@@ -22,37 +22,30 @@ Release:        0
 Summary:        Firmware Analysis Tool
 License:        MIT
 Group:          Development/Tools/Debuggers
-Url:            https://github.com/devttys0/binwalk
+URL:            https://github.com/devttys0/binwalk
 Source:         https://github.com/devttys0/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  python3-curses
+BuildRequires:  python3-setuptools
 # Depends on libmagic.
 Requires:       file
+Requires:       python3-curses
+# Depends on libfuzzy.
+Requires:       ssdeep
 Recommends:     bzip2
 Recommends:     cabextract
 Recommends:     cpio
 Recommends:     gzip
-%if 0%{?suse_version} > 1500
-Recommends:     p7zip-full
-%else
-Recommends:     p7zip
-%endif
 Recommends:     unrar
 Recommends:     xz
 Recommends:     zlib
 Suggests:       java
-BuildRequires:  fdupes
-%if 0%{?suse_version} >= 1230
-BuildRequires:  python3-devel
-Requires:       python3-curses
-# Depends on libfuzzy.
-Requires:       ssdeep
-%else
-BuildRequires:  python-devel
-Requires:       python-argparse
-Requires:       python-curses
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%endif
-%if 0%{?suse_version} > 1110
 BuildArch:      noarch
+%if 0%{?suse_version} > 1500
+Recommends:     p7zip-full
+%else
+Recommends:     p7zip
 %endif
 
 %description
@@ -70,32 +63,17 @@ bootloaders, filesystems, etc.
 %setup -q
 
 %build
-%if 0%{?suse_version} >= 1230
+%python3_build
-python3 setup.py build
-%else
-python setup.py build
-%endif
 
 %install
-%if 0%{?suse_version} >= 1230
+%python3_install
-python3 setup.py install --root=%{buildroot} --prefix=%{_prefix}
-%fdupes %{buildroot}%{python3_sitelib}
-%else
-python2 setup.py install --root=%{buildroot} --prefix=%{_prefix}
-%fdupes %{buildroot}%{python_sitelib}
-%endif
 chmod 644 API.md
 
 %files
-%defattr(-,root,root)
+%license LICENSE
-%doc API.md LICENSE
+%doc API.md
 %{_bindir}/%{name}
-%if 0%{?suse_version} >= 1230
 %{python3_sitelib}/%{name}/
 %{python3_sitelib}/%{name}-*
-%else
-%{python_sitelib}/%{name}/
-%{python_sitelib}/%{name}-*
-%endif
 
 %changelog