From c1ce4c268728b94ae6e379c96b2a99ee5d657fb6 Mon Sep 17 00:00:00 2001
From: rpmbuild <rpmbuild>
Date: Mon, 14 Oct 2019 14:24:20 +0000
Subject: [PATCH] bump the python binding for yara to 3.11.0

---
 .gitignore       |  1 +
 python-yara.spec | 70 ++++++++++++++++++++++++++++++++++++++----------
 sources          |  2 +-
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa1ccca..2eb7876 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /python-yara-3.7.0.tar.gz
 /python-yara-3.8.1.tar.gz
 /python-yara-3.9.0.tar.gz
+/python-yara-3.11.0.tar.gz
diff --git a/python-yara.spec b/python-yara.spec
index c63c01d..2d6f5c7 100644
--- a/python-yara.spec
+++ b/python-yara.spec
@@ -1,6 +1,6 @@
 Name:           python-yara
-Version:        3.9.0
-%global         rel             2
+Version:        3.11.0
+%global         rel             1
 Summary:        Python binding for the YARA pattern matching tool
 License:        ASL 2.0
 URL:            http://github.com/VirusTotal/yara-python/
@@ -14,11 +14,29 @@ URL:            http://github.com/VirusTotal/yara-python/
 %global         gitdate         20190222
 %global         shortcommit     %(c=%{commit}; echo ${c:0:7})
 
-# Build also the python3 package
+
+%global         common_description %{expand:
+Python binding for the YARA pattern matching tool.
+YARA is a tool aimed at (but not limited to) helping malware researchers to
+identify and classify malware samples. With YARA you can create descriptions
+of malware families (or whatever you want to describe) based on textual or
+binary patterns. Each description, a.k.a rule, consists of a set of strings
+and a Boolean expression which determine its logic.}
+
+# Do the check during build
 %if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} >= 7 )
 %global         with_check      1
 %endif
 
+%if ( 0%{?fedora} && 0%{?fedora} >= 30 ) || ( 0%{?rhel} && 0%{?rhel} >= 8 )
+                # by default build without the python2 support on systems f30+ or rhel8+
+%bcond_with     python2 
+%else
+                # build with the python2 support on system up to f29 and/or rhel7
+%bcond_without  python2 
+%endif
+
+
 # Build source is github release=1 or git commit=0
 %global         build_release    1
 
@@ -33,8 +51,7 @@ Source0:        https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{nam
 BuildRequires:  gcc
 BuildRequires:  pkgconfig(yara)
 BuildRequires:  libtool
-BuildRequires:  yara-devel
-BuildRequires:  python2
+BuildRequires:  yara-devel >= %{version}
 # html doc generation
 BuildRequires:  /usr/bin/sphinx-build
 
@@ -43,14 +60,15 @@ BuildRequires:  python%{python3_pkgversion}-nose
 BuildRequires:  python%{python3_pkgversion}-setuptools
 
 
+%if 0%{?with_python2}  > 0
+BuildRequires:  python2
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+%endif
+
 
 %description
-Python binding for the YARA pattern matching tool.
-YARA is a tool aimed at (but not limited to) helping malware researchers to
-identify and classify malware samples. With YARA you can create descriptions
-of malware families (or whatever you want to describe) based on textual or
-binary patterns. Each description, a.k.a rule, consists of a set of strings
-and a Boolean expression which determine its logic.
+%{common_description}
 
 
 
@@ -62,9 +80,17 @@ Summary:        Python3 binding for the YARA pattern matching tool
 
 
 %description -n python%{python3_pkgversion}-%{srcname}
-YARA for Python3 - This is a Python extension that gives access to YARA's
-powerful features from Python scripts.
+%{common_description}
 
+%if 0%{?with_python2}  > 0
+%package -n python2-%{srcname}
+Summary:        Python2 binding for the YARA pattern matching tool
+%{?python_provide:%python_provide python2-%{srcname}}
+
+
+%description -n python2-%{srcname}
+%{common_description}
+%endif
 
 #====================================================================
 %prep
@@ -81,12 +107,20 @@ powerful features from Python scripts.
 
 #====================================================================
 %build
+%if 0%{?with_python2}  > 0
+%py2_build "--dynamic-linking"
+%endif
+
 %py3_build "--dynamic-linking"
 
 
 
 #====================================================================
 %install
+%if 0%{?with_python2}  > 0
+%py2_install
+%endif
+
 %py3_install
 
 
@@ -138,10 +172,18 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3" -v ./tests.py:TestYar
 %doc README.rst
 %{python3_sitearch}/%{srcname}*
 
-
+%if 0%{?with_python2}  > 0
+%files -n python2-%{srcname}
+%license LICENSE
+%doc README.rst
+%{python2_sitearch}/%{srcname}*
+%endif
 
 #====================================================================
 %changelog
+* Mon Oct 14 2019 Michal Ambroz <rebus at, seznam.cz> - 3.11.0-1
+- bump to 3.11.0, omit py2 for f30+ and epel8+
+
 * Fri Mar 22 2019 Michal Ambroz <rebus at, seznam.cz> - 3.9.0-2
 - change dependency to sphinx based on the /usr/bin/sphinx-build
 
diff --git a/sources b/sources
index e9be353..2647b91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-yara-3.9.0.tar.gz) = 3871cb457f29b3149ed4656abfb1cef40a42bbce09f0480b24dbe0fddde17560037303702f3ae74fed39773470859dfdd0e69cd9f8e4dc8a1e54a4dde9239bae
+SHA512 (python-yara-3.11.0.tar.gz) = 0c8e6cbe51aa858c6d56b95c88bd450016924008b57b4910ed8edfb7bba4d7bfc18736844817978f74e72bed6765c484f275de4e7a53ec85048fb01713b6e959