diff --git a/.gitignore b/.gitignore index 74df757..2ab97e6 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /satyr-0.25.tar.xz /satyr-0.26.tar.xz /satyr-0.27.tar.xz +/satyr-0.28.tar.xz diff --git a/satyr.spec b/satyr.spec index 20b5bd2..d0afceb 100644 --- a/satyr.spec +++ b/satyr.spec @@ -1,5 +1,3 @@ -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - %if 0%{?fedora} || 0%{?rhel} > 7 # Enable python3 build by default %bcond_without python3 @@ -7,34 +5,21 @@ %bcond_with python3 %endif -%if 0%{?rhel} > 7 || 0%{?fedora} > 28 -# Disable python2 build by default -%bcond_with python2 -%else -%bcond_without python2 -%endif - %if 0%{?suse_version} - %define python2_sitearch %{python_sitearch} - %define python2_devel python-devel %define libdw_devel libdw-devel %define libelf_devel libelf-devel %else - %define python2_devel python2-devel %define libdw_devel elfutils-devel %define libelf_devel elfutils-libelf-devel %endif Name: satyr -Version: 0.27 -Release: 4%{?dist} +Version: 0.28 +Release: 1%{?dist} Summary: Tools to create anonymous, machine-friendly problem reports License: GPLv2+ URL: https://github.com/abrt/satyr Source0: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.xz -%if %{with python2} -BuildRequires: %{python2_devel} -%endif # with python2 %if %{with python3} BuildRequires: python3-devel %endif # with python3 @@ -48,9 +33,6 @@ BuildRequires: pkgconfig BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: gdb -%if %{with python2} -BuildRequires: python2-sphinx -%endif # with python2 %if %{with python3} BuildRequires: python3-sphinx %endif # with python3 @@ -78,20 +60,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development libraries and headers for %{name}. -%if %{with python2} -%package -n python2-satyr -%{?python_provide:%python_provide python2-satyr} -# Remove before F30 -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < 0.24 -Summary: Python bindings for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description -n python2-satyr -Python bindings for %{name}. -%endif #with python2 - %if %{with python3} %package -n python3-satyr %{?python_provide:%python_provide python3-satyr} @@ -116,13 +84,9 @@ Python 3 bindings for %{name}. %build %configure \ -%if %{without python2} - --without-python2 \ -%endif # with python2 %if %{without python3} --without-python3 \ %endif # with python3 -%{?_without_python2} \ --disable-static \ --enable-doxygen-docs @@ -163,13 +127,6 @@ make check|| { %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%if %{with python2} -%files -n python2-satyr -%dir %{python2_sitearch}/%{name} -%{python2_sitearch}/%{name}/* -%{_mandir}/man3/satyr-python.3* -%endif # with python2 - %if 0%{?with_python3} %files -n python3-satyr %dir %{python3_sitearch}/%{name} @@ -177,6 +134,9 @@ make check|| { %endif %changelog +* Fri Jun 21 2019 Ernestas Kulik - 0.28-1 +- New version 0.28 + * Mon Jun 10 22:13:23 CET 2019 Igor Gnatenko - 0.27-4 - Rebuild for RPM 4.15 diff --git a/sources b/sources index 334e8ee..7fdcc4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (satyr-0.27.tar.xz) = d52bcfb8b0343ec8b71477f0e6655f070fecd2b927aedaeee46f0ba17059a145c281179846789ea85bcd1e80ab43077362c94539dd9c1c5185870d1132d8cec9 +SHA512 (satyr-0.28.tar.xz) = 63d9b3e1344b3f253da7c7f5ed78a81d1f9404d7a883f4f929412ed2d4c67d8fe39cfc531ee4e03995a1c93bb1e1af159069f288d5501cf0e5b220206c63659a