The package rpms/python-yara.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/python-yara.git/commit/?id=a8a00a4e0....
Change: +%ifarch s390 s390x %{power64}
Thanks.
Full change: ============
commit 32993e661264711bf3fd20a3239007e159b5e4fc Author: rpmbuild <rpmbuild> Date: Mon Oct 14 17:33:04 2019 +0000
fix release
diff --git a/python-yara.spec b/python-yara.spec index 4834969..78b85e1 100644 --- a/python-yara.spec +++ b/python-yara.spec @@ -1,6 +1,6 @@ Name: python-yara Version: 3.11.0 -%global baserelease 1 +%global baserelease 2 Summary: Python binding for the YARA pattern matching tool License: ASL 2.0 URL: http://github.com/VirusTotal/yara-python/
commit 9d2e23c15e5b27ef86e2fef31bffa306e32b5196 Author: rpmbuild <rpmbuild> Date: Mon Oct 14 17:23:05 2019 +0000
fix the release version
diff --git a/python-yara.spec b/python-yara.spec index 511c4c1..4834969 100644 --- a/python-yara.spec +++ b/python-yara.spec @@ -1,6 +1,6 @@ Name: python-yara Version: 3.11.0 -%global rel 1 +%global baserelease 1 Summary: Python binding for the YARA pattern matching tool License: ASL 2.0 URL: http://github.com/VirusTotal/yara-python/ @@ -37,14 +37,14 @@ and a Boolean expression which determine its logic.} %endif
-# Build source is github release=1 or git commit=0 +# Build source is versioned github release=1 or unversioned git commit=0 %global build_release 1
%if 0%{?build_release} > 0 -Release: %{rel}%{?dist}.2 +Release: %{baserelease}%{?dist} Source0: https://github.com/%%7Bgituser%7D/%%7Bgitname%7D/archive/v%%7Bversion%7D.tar... %else -Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.2 +Release: %{baserelease}.%{gitdate}git%{shortcommit}%{?dist} Source0: https://github.com/%%7Bgituser%7D/%%7Bgitname%7D/archive/%%7Bcommit%7D/%%7Bn... %endif #Build_release
@@ -181,6 +181,9 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3" -v ./tests.py:TestYar
#==================================================================== %changelog +* Mon Oct 14 2019 Michal Ambroz <rebus at, seznam.cz> - 3.11.0-2 +- fix the release number + * 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+
commit a8a00a4e06513f49d57b5094d87bfedc480af0ef Author: rpmbuild <rpmbuild> Date: Mon Oct 14 14:28:34 2019 +0000
cosmetics - remove mixedspaces
diff --git a/python-yara.spec b/python-yara.spec index 7bbb0af..511c4c1 100644 --- a/python-yara.spec +++ b/python-yara.spec @@ -142,7 +142,7 @@ EXCLUDE='--exclude=^nothing$' # 3.6.3 - testCompileFile started failing - https://kojipkgs.fedoraproject.org//work/tasks/9619/20589619/build.log # https://github.com/VirusTotal/yara-python/issues/54 # seems to be fixed in 3.9.0 -%ifarch s390 s390x %{power64} +%ifarch s390 s390x %{power64} # EXCLUDE='--exclude=^testCompare$|^testModuleData$|^testEntrypoint$|^testIn$|^testIntegerFunctions$|^testCompileFile$' EXCLUDE='--exclude=^nothing$' %endif
commit 5f3fdad8d08696b88c315786ddc213962e01b36e Merge: c1ce4c2 d8f0850 Author: rpmbuild <rpmbuild> Date: Mon Oct 14 14:26:51 2019 +0000
bump to 3.11.0
diff --cc python-yara.spec index 2d6f5c7,6ab9fd3..7bbb0af --- a/python-yara.spec +++ b/python-yara.spec @@@ -181,9 -142,12 +181,15 @@@ PYTHONPATH=%{buildroot}/%{python3_sitea
#==================================================================== %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+ + + * Mon Aug 19 2019 Miro Hronok mhroncok@redhat.com - 3.9.0-2.2 + - Rebuilt for Python 3.8 + + * Fri Jul 26 2019 Fedora Release Engineering releng@fedoraproject.org - 3.9.0-2.1 + - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * 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
commit c1ce4c268728b94ae6e379c96b2a99ee5d657fb6 Author: rpmbuild <rpmbuild> Date: Mon Oct 14 14:24:20 2019 +0000
bump the python binding for yara to 3.11.0
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/%%7Bgituser%7D/%%7Bgitname%7D/archive/%%7Bcommit%7D/%%7Bn... 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
commit d8f08508f6c792323a2bab634c2072cceafc7725 Author: Miro Hronok miro@hroncok.cz Date: Mon Aug 19 11:02:56 2019 +0200
Rebuilt for Python 3.8
diff --git a/python-yara.spec b/python-yara.spec index 099bf11..6ab9fd3 100644 --- a/python-yara.spec +++ b/python-yara.spec @@ -23,10 +23,10 @@ URL: http://github.com/VirusTotal/yara-python/ %global build_release 1
%if 0%{?build_release} > 0 -Release: %{rel}%{?dist}.1 +Release: %{rel}%{?dist}.2 Source0: https://github.com/%%7Bgituser%7D/%%7Bgitname%7D/archive/v%%7Bversion%7D.tar... %else -Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.1 +Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.2 Source0: https://github.com/%%7Bgituser%7D/%%7Bgitname%7D/archive/%%7Bcommit%7D/%%7Bn... %endif #Build_release
@@ -142,6 +142,9 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3" -v ./tests.py:TestYar
#==================================================================== %changelog +* Mon Aug 19 2019 Miro Hronok mhroncok@redhat.com - 3.9.0-2.2 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering releng@fedoraproject.org - 3.9.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild