Merge remote-tracking branch 'origin/rawhide' into epel7

.gitignore

@@ -10,3 +10,4 @@
 /python-yara-4.0.3.tar.gz
 /python-yara-4.0.4.tar.gz
 /python-yara-4.0.5.tar.gz
+/python-yara-4.1.0.tar.gz

python-yara.spec

@@ -1,17 +1,23 @@
 Name:           python-yara
-Version:        4.0.5
-%global         baserelease     2
+Version:        4.1.0
+%global         baserelease     1
 Summary:        Python binding for the YARA pattern matching tool
 License:        ASL 2.0
 URL:            http://github.com/VirusTotal/yara-python/
+VCS:            http://github.com/VirusTotal/yara-python/
 #               http://VirusTotal.github.io/yara/
 #               https://github.com/VirusTotal/yara-python/releases
 
+# By default build from a release tarball.
+# If you want to rebuild from a unversioned commit from git do that with 
+# rpmbuild --rebuild python-yara.src.dpm --without release
+%bcond_without  release
+
 %global         srcname         yara
 %global         gituser         VirusTotal
 %global         gitname         %{srcname}-python
-%global         commit          83c005eda9b3dbe08581515e8db570ad7dcfee18
-%global         gitdate         20210223
+%global         commit          dc838e211e45442d219012099aaa63efa812c4be
+%global         gitdate         20210427
 %global         shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 
@@ -30,17 +36,15 @@ and a Boolean expression which determine its logic.}
 
 %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 
+%bcond_with     python2
 %else
                 # build with the python2 support on system up to f29 and/or rhel7
-%bcond_without  python2 
+%bcond_without  python2
 %endif
 
 
-# Build source is versioned github release=1 or unversioned git commit=0
-%global         build_release    1
 
-%if 0%{?build_release}  > 0
+%if 0%{?with_release}
 Release:        %{baserelease}%{?dist}
 Source0:        https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 %else
@@ -94,7 +98,7 @@ Summary:        Python2 binding for the YARA pattern matching tool
 
 #====================================================================
 %prep
-%if 0%{?build_release} > 0
+%if 0%{?with_release}
 # Build from git release version
 %autosetup -n %{gitname}-%{version}
 
@@ -182,6 +186,12 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3" -v ./tests.py:TestYar
 
 #====================================================================
 %changelog
+* Tue Apr 27 2021 Michal Ambroz <rebus at, seznam.cz> - 4.1.0-1
+- bump the python-yara as well to 4.1.0
+
+* Tue Apr 27 2021 Michal Ambroz <rebus at, seznam.cz> - 4.0.5-3
+- rebuild for new version of yara 4.1.0
+
 * Sun Apr 25 2021 Michal Ambroz <rebus at, seznam.cz> - 4.0.5-2
 - rebuild for epel
 

sources

@@ -1 +1 @@
-SHA512 (python-yara-4.0.5.tar.gz) = 1c4663516e6ee908192145a6b53312bd529d704407b1c1057aa4b4dfaa2f561630e86f47fac60b5a6724ad502d8df0e674eb36bad7a282b5ed5c0782833eead4
+SHA512 (python-yara-4.1.0.tar.gz) = 8b9ce780b6639ab2ee5222adec888c7e0fb6be81c7c64a8b33b033de3f261f9707aa208b7a3a86749f6e86a83fe6d73941c816857faf6eb714399d1f50239b51