diff --git a/.gitignore b/.gitignore index f854638..fe8117c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /satyr-0.16.tar.xz /satyr-0.18.tar.xz /satyr-0.19.tar.xz +/satyr-0.20.tar.gz +/satyr-0.20.tar.xz diff --git a/satyr.spec b/satyr.spec index 217a51f..7a36a08 100644 --- a/satyr.spec +++ b/satyr.spec @@ -7,6 +7,13 @@ %define enable_python_manpage 1 %endif +%if 0%{?fedora} + %define with_python3 1 +%else + # EL doesn't have Python 3 + %define with_python3 0 +%endif + %if 0%{?suse_version} %define python2_devel python-devel %define libdw_devel libdw-devel @@ -18,15 +25,17 @@ %endif Name: satyr -Version: 0.19 -Release: 2%{?dist} +Version: 0.20 +Release: 1%{?dist} Summary: Tools to create anonymous, machine-friendly problem reports Group: System Environment/Libraries License: GPLv2+ URL: https://github.com/abrt/satyr Source0: https://fedorahosted.org/released/abrt/satyr-%{version}.tar.xz BuildRequires: %{python2_devel} +%if 0%{?with_python3} BuildRequires: python3-devel +%endif # if with_python3 BuildRequires: %{libdw_devel} BuildRequires: %{libelf_devel} BuildRequires: binutils-devel @@ -64,6 +73,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description python Python bindings for %{name}. +%if 0%{?with_python3} %package python3 Summary: Python 3 bindings for %{name} Group: Development/Libraries @@ -71,6 +81,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description python3 Python 3 bindings for %{name}. +%endif # if with_python3 %prep %setup -q @@ -80,6 +91,9 @@ Python 3 bindings for %{name}. %if ! %{?enable_python_manpage} --disable-python-manpage \ %endif +%if ! %{?with_python3} + --without-python3 \ +%endif --disable-static make %{?_smp_mflags} @@ -120,11 +134,20 @@ make check || { %{_mandir}/man3/satyr-python.3* %endif +%if 0%{?with_python3} %files python3 %dir %{python3_sitearch}/%{name} %{python3_sitearch}/%{name}/* +%endif %changelog +* Thu Sep 17 2015 Matej Habrnal 0.20-1 +- New upstream version + - Don't parse SO files as source_files + - Add support for OS Variant + - Fix the missing frame build_id and file_name + - Bugfixes + * Sun Jul 26 2015 Kevin Fenzi 0.19-2 - Rebuild for new librpm diff --git a/sources b/sources index 1cdb94f..1a7c3d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8dd7265075be7ac64ce93ec13a856246 satyr-0.19.tar.xz +ebb66f06caa001f7acfa366affca5c52 satyr-0.20.tar.xz