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=18f492...
https://src.fedoraproject.org/cgit/rpms/python-yara.git/commit/?id=09ce81...
https://src.fedoraproject.org/cgit/rpms/python-yara.git/commit/?id=a8a00a....
Change:
-%ifarch s390 s390x %{power64}
+%ifarch armv7hl
+%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/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na...
%else
-Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.2
+Release: %{baserelease}.%{gitdate}git%{shortcommit}%{?dist}
Source0:
https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{vers...
%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(a)redhat.com> - 3.9.0-2.2
+ - Rebuilt for Python 3.8
+
+ * Fri Jul 26 2019 Fedora Release Engineering <releng(a)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/%{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
commit d8f08508f6c792323a2bab634c2072cceafc7725
Author: Miro Hronok <miro(a)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/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na...
%else
-Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.1
+Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.2
Source0:
https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{vers...
%endif #Build_release
@@ -142,6 +142,9 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3"
-v ./tests.py:TestYar
#====================================================================
%changelog
+* Mon Aug 19 2019 Miro Hronok <mhroncok(a)redhat.com> - 3.9.0-2.2
+- Rebuilt for Python 3.8
+
* Fri Jul 26 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.9.0-2.1
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
commit e57d767dbbf28d2f3e9a622c19afee7a933257a3
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 26 17:13:01 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/python-yara.spec b/python-yara.spec
index c63c01d..099bf11 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}
+Release: %{rel}%{?dist}.1
Source0:
https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na...
%else
-Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}
+Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.1
Source0:
https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{vers...
%endif #Build_release
@@ -142,6 +142,9 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3"
-v ./tests.py:TestYar
#====================================================================
%changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng(a)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 39fc6263389b87ea6b6f705f4d14ff184d7362fe
Author: rpmbuild <rpmbuild>
Date: Fri Mar 22 13:37:26 2019 +0000
change sphinx dependency to be based on the file /usr/bin/sphinx-build
diff --git a/python-yara.spec b/python-yara.spec
index 18f0a38..c63c01d 100644
--- a/python-yara.spec
+++ b/python-yara.spec
@@ -1,6 +1,6 @@
Name: python-yara
Version: 3.9.0
-%global rel 1
+%global rel 2
Summary: Python binding for the YARA pattern matching tool
License: ASL 2.0
URL:
http://github.com/VirusTotal/yara-python/
@@ -36,11 +36,7 @@ BuildRequires: libtool
BuildRequires: yara-devel
BuildRequires: python2
# html doc generation
-%if 0%{?rhel} || 0%{?fedora} < 31
-BuildRequires: python2-sphinx
-%else
-BuildRequires: python3-sphinx
-%endif
+BuildRequires: /usr/bin/sphinx-build
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-nose
@@ -146,6 +142,9 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3"
-v ./tests.py:TestYar
#====================================================================
%changelog
+* 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
+
* Mon Mar 18 2019 Michal Ambroz <rebus at, seznam.cz> - 3.9.0-1
- bump to 3.9.0
commit 09ce81e2bdf1f878a0360cacc65be1ec99f4fc9c
Author: rpmbuild <rpmbuild>
Date: Mon Mar 18 23:20:37 2019 +0000
exclude testModuleData on the armv7hl architecture
diff --git a/python-yara.spec b/python-yara.spec
index e6d2d67..18f0a38 100644
--- a/python-yara.spec
+++ b/python-yara.spec
@@ -103,6 +103,7 @@ powerful features from Python scripts.
# reported to upstream -
https://github.com/VirusTotal/yara-python/issues/21
# temporarily run the failing tests but ignore the results for those 2
# EXCLUDE='--exclude=^testCompare$|^testModuleData$'
+# seems to be fixed in 3.9.0
EXCLUDE='--exclude=^nothing$'
# Yara is not prepared to run on s390 - more tests failing on s390
@@ -110,10 +111,18 @@ EXCLUDE='--exclude=^nothing$'
#
https://github.com/VirusTotal/yara-python/issues/25
# 3.6.3 - testCompileFile started failing -
https://kojipkgs.fedoraproject.org//work/tasks/9619/20589619/build.log
#
https://github.com/VirusTotal/yara-python/issues/54
-%ifarch s390 s390x %{power64}
-EXCLUDE='--exclude=^testCompare$|^testModuleData$|^testEntrypoint$|^testIn$|^testIntegerFunctions$|^testCompileFile$'
+# seems to be fixed in 3.9.0
+%ifarch s390 s390x %{power64}
+#
EXCLUDE='--exclude=^testCompare$|^testModuleData$|^testEntrypoint$|^testIn$|^testIntegerFunctions$|^testCompileFile$'
+EXCLUDE='--exclude=^nothing$'
+%endif
+
+# 3.9.0 - testModuleData is always failing for architecture armv7hl
+%ifarch armv7hl
+EXCLUDE='--exclude=^testModuleData$'
%endif
+
# Find the NOSETEST binary or use false if not present
NOSETESTS3=`ls /usr/bin/nosetests-3.* || which false `
PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3" -v
"$EXCLUDE"
@@ -121,7 +130,8 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3"
-v "$EXCLUDE"
# Run potentially ignored tests separately so we can at least see the results
PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3" -v
./tests.py:TestYara.testCompare \
./tests.py:TestYara.testModuleData ./tests.py:TestYara.testEntrypoint \
- ./tests.py:TestYara.testIn ./tests.py:TestYara.testIntegerFunctions || true
+ ./tests.py:TestYara.testIn ./tests.py:TestYara.testIntegerFunctions \
+ ./tests.py:TestYara.testCompileFile || true
%endif # with_check
commit f57433cc926a39f3c38964cbcbb2134856496088
Author: rpmbuild <rpmbuild>
Date: Mon Mar 18 19:49:19 2019 +0000
python3-sphinx for 31
diff --git a/python-yara.spec b/python-yara.spec
index ac86ee4..e6d2d67 100644
--- a/python-yara.spec
+++ b/python-yara.spec
@@ -36,7 +36,11 @@ BuildRequires: libtool
BuildRequires: yara-devel
BuildRequires: python2
# html doc generation
+%if 0%{?rhel} || 0%{?fedora} < 31
+BuildRequires: python2-sphinx
+%else
BuildRequires: python3-sphinx
+%endif
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-nose
@@ -194,7 +198,7 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3"
-v ./tests.py:TestYar
- fix the arch lists
* Tue Aug 16 2016 Michal Ambroz <rebus at, seznam.cz> - 3.5.0-7
-- adding test exclusions also for armv7hl and ppc64le
+- adding test exclusions also for armv7hl and ppc64le
* Tue Aug 16 2016 Michal Ambroz <rebus at, seznam.cz> - 3.5.0-6
- additionally testEntrypoint testIn testIntegerFunctions failing on s390/ppc64
commit 926f10ec55135719e3f7532e31e98f1cbec331a3
Author: rpmbuild <rpmbuild>
Date: Mon Mar 18 19:44:04 2019 +0000
bump to 3.9.0
diff --git a/.gitignore b/.gitignore
index 6467b7f..aa1ccca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/python-yara-3.6.3.tar.gz
/python-yara-3.7.0.tar.gz
/python-yara-3.8.1.tar.gz
+/python-yara-3.9.0.tar.gz
diff --git a/python-yara.spec b/python-yara.spec
index 732e260..ac86ee4 100644
--- a/python-yara.spec
+++ b/python-yara.spec
@@ -1,6 +1,6 @@
Name: python-yara
-Version: 3.8.1
-%global rel 3
+Version: 3.9.0
+%global rel 1
Summary: Python binding for the YARA pattern matching tool
License: ASL 2.0
URL:
http://github.com/VirusTotal/yara-python/
@@ -10,8 +10,8 @@ URL:
http://github.com/VirusTotal/yara-python/
%global srcname yara
%global gituser VirusTotal
%global gitname %{srcname}-python
-%global commit a73270276df017d660f438d5ff235bd5f3259bc8
-%global gitdate 20180816
+%global commit 63ac2417a918692be6d5bd659fbfd39564396ec3
+%global gitdate 20190222
%global shortcommit %(c=%{commit}; echo ${c:0:7})
# Build also the python3 package
@@ -23,10 +23,10 @@ URL:
http://github.com/VirusTotal/yara-python/
%global build_release 1
%if 0%{?build_release} > 0
-Release: %{rel}%{?dist}.2
+Release: %{rel}%{?dist}
Source0:
https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na...
%else
-Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.2
+Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}
Source0:
https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{vers...
%endif #Build_release
@@ -94,11 +94,12 @@ powerful features from Python scripts.
%check
%if 0%{?with_check}
# ==============================================================================
-# Tests for python3 always fail on testModuleData testcase
-# Tests for python3 randomly fail on testCompare testcase
-# reporting to upstream -
https://github.com/VirusTotal/yara-python/issues/21
+# Tests for python3 used to always fail on testModuleData testcase
+# Tests for python3 used to randomly fail on testCompare testcase
+# reported to upstream -
https://github.com/VirusTotal/yara-python/issues/21
# temporarily run the failing tests but ignore the results for those 2
-EXCLUDE='--exclude=^testCompare$|^testModuleData$'
+# EXCLUDE='--exclude=^testCompare$|^testModuleData$'
+EXCLUDE='--exclude=^nothing$'
# Yara is not prepared to run on s390 - more tests failing on s390
#
http://s390.koji.fedoraproject.org/kojifiles/work/tasks/9135/2399135/buil...
@@ -131,6 +132,9 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3"
-v ./tests.py:TestYar
#====================================================================
%changelog
+* Mon Mar 18 2019 Michal Ambroz <rebus at, seznam.cz> - 3.9.0-1
+- bump to 3.9.0
+
* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.8.1-3.2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 221fcbd..e9be353 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-yara-3.8.1.tar.gz) =
5d52e2f374cf8d8a2b8afc794edaeded6a433fc184b285575bc53e8f98280e003ac2f9f2b9219c961cf2cffe82df343e74401412435ce8a8e7eff461148f7bf2
+SHA512 (python-yara-3.9.0.tar.gz) =
3871cb457f29b3149ed4656abfb1cef40a42bbce09f0480b24dbe0fddde17560037303702f3ae74fed39773470859dfdd0e69cd9f8e4dc8a1e54a4dde9239bae
commit 79c3738b74c9caa59f8e47508dab8bd681717abe
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Feb 2 10:10:13 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/python-yara.spec b/python-yara.spec
index bc08549..732e260 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/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na...
%else
-Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.1
+Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.2
Source0:
https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{vers...
%endif #Build_release
@@ -131,6 +131,9 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3"
-v ./tests.py:TestYar
#====================================================================
%changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
3.8.1-3.2
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Fri Oct 12 2018 Zbigniew Jdrzejewski-Szmek <zbyszek(a)in.waw.pl> - 3.8.1-3
- Python2 binary package has been removed
See
https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
commit 72b2ba5a93967b5aeb9d928731aa4e7f3a620593
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:18:19 2019 +0100
Remove obsolete Group tag
References:
https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/python-yara.spec b/python-yara.spec
index 255a02b..bc08549 100644
--- a/python-yara.spec
+++ b/python-yara.spec
@@ -2,7 +2,6 @@ Name: python-yara
Version: 3.8.1
%global rel 3
Summary: Python binding for the YARA pattern matching tool
-Group: Development/Libraries
License: ASL 2.0
URL:
http://github.com/VirusTotal/yara-python/
#
http://VirusTotal.github.io/yara/
@@ -58,7 +57,6 @@ and a Boolean expression which determine its logic.
#====================================================================
%package -n python%{python3_pkgversion}-%{srcname}
Summary: Python3 binding for the YARA pattern matching tool
-Group: Development/Libraries
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
commit 18f492bf0c6440ca615f53b6b834b8ab56c3be29
Author: Zbigniew Jdrzejewski-Szmek <zbyszek(a)in.waw.pl>
Date: Fri Oct 12 16:04:06 2018 +0200
Python2 binary package has been removed
diff --git a/python-yara.spec b/python-yara.spec
index 65c7dfd..255a02b 100644
--- a/python-yara.spec
+++ b/python-yara.spec
@@ -1,6 +1,6 @@
Name: python-yara
Version: 3.8.1
-%global rel 2
+%global rel 3
Summary: Python binding for the YARA pattern matching tool
Group: Development/Libraries
License: ASL 2.0
@@ -17,32 +17,17 @@ URL:
http://github.com/VirusTotal/yara-python/
# Build also the python3 package
%if 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} >= 7 )
-%global with_python3 1
%global with_check 1
%endif
-# Introduce the python macros on older platforms if needed
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-
-%if 0%{?fedora} <= 21
- %{!?py2_build: %global py2_build %{__python2} setup.py build
--executable="%{__python2} -s"}
- %{!?py2_install: %global py2_install %{__python2} setup.py install -O1
--skip-build --root %{buildroot}}
- %{!?py3_build: %global py3_build %{__python3} setup.py build
--executable="%{__python3} -s"}
- %{!?py3_install: %global py3_install %{__python3} setup.py install -O1
--skip-build --root %{buildroot}}
-%endif
-
# Build source is github release=1 or git commit=0
%global build_release 1
%if 0%{?build_release} > 0
-Release: %{rel}%{?dist}
+Release: %{rel}%{?dist}.1
Source0:
https://github.com/%{gituser}/%{gitname}/archive/v%{version}.tar.gz#/%{na...
%else
-Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}
+Release: %{rel}.%{gitdate}git%{shortcommit}%{?dist}.1
Source0:
https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{vers...
%endif #Build_release
@@ -51,19 +36,12 @@ BuildRequires: pkgconfig(yara)
BuildRequires: libtool
BuildRequires: yara-devel
BuildRequires: python2
-BuildRequires: python2-devel
-BuildRequires: python2-setuptools
# html doc generation
-BuildRequires: python2-sphinx
-%if 0%{?with_check}
-BuildRequires: python2-nose
-%endif
+BuildRequires: python3-sphinx
-%if 0%{?with_python3}
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-nose
BuildRequires: python%{python3_pkgversion}-setuptools
-%endif # if with_python3
@@ -78,20 +56,6 @@ and a Boolean expression which determine its logic.
#====================================================================
-%package -n python2-%{srcname}
-Summary: Python2 binding for the YARA pattern matching tool
-Group: Development/Libraries
-%{?python_provide:%python_provide python2-%{srcname}}
-# Provide also the upstream original name yara-python
-
-
-%description -n python2-%{srcname}
-YARA for Python2 - This is a Python extension that gives access to YARA's
-powerful features from Python scripts.
-
-
-
-%if 0%{?with_python3}
%package -n python%{python3_pkgversion}-%{srcname}
Summary: Python3 binding for the YARA pattern matching tool
Group: Development/Libraries
@@ -102,7 +66,6 @@ Group: Development/Libraries
%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.
-%endif # with_python3
#====================================================================
@@ -120,57 +83,23 @@ powerful features from Python scripts.
#====================================================================
%build
-%py2_build "--dynamic-linking"
-
-%if 0%{?with_python3}
%py3_build "--dynamic-linking"
-%endif # with_python3
#====================================================================
%install
-%py2_install
-
-%if 0%{?with_python3}
%py3_install
-%endif # with_python3
#====================================================================
%check
%if 0%{?with_check}
-#python2
-EXCLUDE=""
-
-# Test for python-2.7 fails on testModuleData testcase on arm platform
-%ifarch %{arm}
-EXCLUDE='--exclude=^testModuleData$'
-%endif
-
-# Yara is not prepared to run on s390 - more tests failing on s390
-#
http://s390.koji.fedoraproject.org/kojifiles/work/tasks/9135/2399135/buil...
-#
https://github.com/VirusTotal/yara-python/issues/25
-# 3.6.3 - testCompileFile started failing -
https://kojipkgs.fedoraproject.org//work/tasks/9619/20589619/build.log
-#
https://github.com/VirusTotal/yara-python/issues/54
-%ifarch s390 s390x %{power64}
-EXCLUDE='--exclude=^testModuleData$|^testEntrypoint$|^testIn$|^testIntegerFunctions$|^testCompileFile$'
-%endif
-
-# Find the NOSETEST binary or use false if not present
-NOSETESTS2=`ls /usr/bin/nosetests-2.* || ls /usr/bin/nosetests || which false `
-PYTHONPATH=%{buildroot}/%{python2_sitearch}/ "$NOSETESTS2" -v
"$EXCLUDE"
-
-# Run potentially ignored tests separately so we can at least see the results
-PYTHONPATH=%{buildroot}/%{python2_sitearch}/ "$NOSETESTS2" -v
./tests.py:TestYara.testModuleData \
- ./tests.py:TestYara.testEntrypoint ./tests.py:TestYara.testIn
./tests.py:TestYara.testIntegerFunctions || true
-
# ==============================================================================
# Tests for python3 always fail on testModuleData testcase
# Tests for python3 randomly fail on testCompare testcase
# reporting to upstream -
https://github.com/VirusTotal/yara-python/issues/21
# temporarily run the failing tests but ignore the results for those 2
-%if 0%{?with_python3}
EXCLUDE='--exclude=^testCompare$|^testModuleData$'
# Yara is not prepared to run on s390 - more tests failing on s390
@@ -190,28 +119,24 @@ PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3"
-v "$EXCLUDE"
PYTHONPATH=%{buildroot}/%{python3_sitearch}/ "$NOSETESTS3" -v
./tests.py:TestYara.testCompare \
./tests.py:TestYara.testModuleData ./tests.py:TestYara.testEntrypoint \
./tests.py:TestYara.testIn ./tests.py:TestYara.testIntegerFunctions || true
-%endif # with_python3
%endif # with_check
#====================================================================
-%files -n python2-%{srcname}
-%license LICENSE
-%doc README.rst
-%{python2_sitearch}/%{srcname}*
-
-%if 0%{?with_python3}
%files -n python%{python3_pkgversion}-%{srcname}
%license LICENSE
%doc README.rst
%{python3_sitearch}/%{srcname}*
-%endif # with_python3
#====================================================================
%changelog
+* Fri Oct 12 2018 Zbigniew Jdrzejewski-Szmek <zbyszek(a)in.waw.pl> - 3.8.1-3
+- Python2 binary package has been removed
+ See
https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
* Mon Aug 27 2018 Michal Ambroz <rebus at, seznam.cz> - 3.8.1-2
- rebuild with yara 3.8.1 override