diff --git a/.gitignore b/.gitignore index 07bd3c4..0f80b57 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /satyr-0.23.tar.xz /satyr-0.24.tar.xz /satyr-0.25.tar.xz +/satyr-0.26.tar.xz diff --git a/satyr.spec b/satyr.spec index a374d3e..28df520 100644 --- a/satyr.spec +++ b/satyr.spec @@ -1,13 +1,21 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?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 - %define with_python3 1 +# Enable python3 build by default +%bcond_without python3 %else - # EL doesn't have Python 3 - %define with_python3 0 +%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 @@ -18,16 +26,18 @@ %endif Name: satyr -Version: 0.25 -Release: 4%{?dist} +Version: 0.26 +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} -%if 0%{?with_python3} +%endif # with python2 +%if %{with python3} BuildRequires: python3-devel -%endif # if with_python3 +%endif # with python3 BuildRequires: %{libdw_devel} BuildRequires: %{libelf_devel} BuildRequires: binutils-devel @@ -38,16 +48,12 @@ BuildRequires: pkgconfig BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: gdb +%if %{with python2} BuildRequires: python2-sphinx - -#Patch0001: 0001-ldconfig-is-not-needed-in-rawhide.patch -#Patch0002: 0002-mark-license-as-license.patch -#Patch0003: 0003-we-do-not-build-for-el6-any-more.patch -#Patch0004: 0004-remove-Groups.patch -#Patch0005: 0005-remove-2-years-old-changelog-entries.patch -#Patch0006: 0006-makefile-create-.tar.xz-with-make-release.patch -#Patch0007: 0007-spec-Update-Python-2-dependency-declarations.patch -Patch0008: 0008-Append-Python-interpreter-as-related-package.patch +%endif # with python2 +%if %{with python3} +BuildRequires: python3-sphinx +%endif # with python3 %description Satyr is a library that can be used to create and process microreports. @@ -65,40 +71,46 @@ 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 < %{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 0%{?with_python3} +%if %{with python3} %package -n python3-satyr %{?python_provide:%python_provide python3-satyr} # Remove before F30 Provides: %{name}-python3 = %{version}-%{release} Provides: %{name}-python3%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python3 < %{version}-%{release} +Obsoletes: %{name}-python3 < 0.24 Summary: Python 3 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} %description -n python3-satyr Python 3 bindings for %{name}. -%endif # if with_python3 +%endif # if with python3 %prep %setup -q %build %configure \ -%if ! %{?with_python3} +%if %{without python2} + --without-python2 \ +%endif # with python2 +%if %{without python3} --without-python3 \ -%endif +%endif # with python3 +%{?_without_python2} \ --disable-static \ --enable-doxygen-docs @@ -111,7 +123,7 @@ make install DESTDIR=%{buildroot} find %{buildroot} -name "*.la" | xargs rm -- %check -make check || { +make check|| { # find and print the logs of failed test # do not cat tests/testsuite.log because it contains a lot of bloat find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \; @@ -130,19 +142,21 @@ make check || { %license COPYING %{_bindir}/satyr %{_mandir}/man1/%{name}.1* -%{_libdir}/libsatyr.so.3* +%{_libdir}/lib*.so.* %files devel # The complex pattern below (instead of simlpy *) excludes Makefile{.am,.in}: %doc apidoc/html/*.{html,png,css,js} -%{_includedir}/satyr/ -%{_libdir}/libsatyr.so -%{_libdir}/pkgconfig/satyr.pc +%{_includedir}/* +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/* +%if %{with python2} %files -n python2-satyr -%dir %{python_sitearch}/%{name} -%{python_sitearch}/%{name}/* +%dir %{python2_sitearch}/%{name} +%{python2_sitearch}/%{name}/* %{_mandir}/man3/satyr-python.3* +%endif # with python2 %if 0%{?with_python3} %files -n python3-satyr @@ -151,24 +165,20 @@ make check || { %endif %changelog -* Tue Mar 27 2018 Martin Kutlak - 0.25-4 -- Modernize spec file +* Tue Apr 17 2018 Matej Habrnal 0.26-1 +- spec: fix Allow python2 to be optional at build time +- Allow python2 to be optional at build time +- normalization: actualize list of functions - Append Python interpreter as related package +- makefile: create .tar.xz with make release -* Mon Feb 12 2018 Iryna Shcherbina - 0.25-3 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Fri Feb 09 2018 Fedora Release Engineering - 0.25-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 19 2018 Martin Kutlak 0.25-1 +* Thu Jan 18 2018 Martin Kutlak 0.25-1 - New upstream version - - Add more normalized functions to the list (#1509086) - -* Mon Dec 04 2017 Matej Habrnal 0.24-2 -- actualize list of normalized functions (#1509086) -- elfutils: Add missing stubs from earlier commit + - Normalization: actualize list of functions + - Fix some compilation warnings + - Allow to build python3 for rhel8 + - Makefile: add make release-* subcommands + - Elfutils: Add missing stubs from earlier commit * Wed Nov 1 2017 Julius Milan 0.24-1 - New upstream version @@ -176,54 +186,19 @@ make check || { - apidoc: generate html docs using doxygen - Fix parsing of subset of arm kernel oopses -* Wed Sep 6 2017 Martin Kutlak - 0.23-9 -- Python 3 binary package renamed to python3-satyr - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 0.23-8 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 0.23-7 -- Python 2 binary package renamed to python2-satyr - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Fri Aug 11 2017 Igor Gnatenko - 0.23-6 -- Rebuilt after RPM update (№ 3) - -* Thu Aug 10 2017 Igor Gnatenko - 0.23-5 -- Rebuilt for RPM soname bump - -* Thu Aug 10 2017 Igor Gnatenko - 0.23-4 -- Rebuilt for RPM soname bump - -* Thu Aug 03 2017 Fedora Release Engineering - 0.23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Mon Mar 13 2017 Matej Habrnal 0.23-1 - New upstream version - Allow rpm to be optional at build time - Do not use deprecated fedorahosted.org -* Sat Feb 11 2017 Fedora Release Engineering - 0.22-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 0.22-2 -- Rebuild for Python 3.6 - -* Wed Dec 14 2016 Jakub Filak 0.22-1 +* Thu Dec 1 2016 Jakub Filak 0.22-1 - New upstream version - Added support fof JavaScript (V8) stack traces - Most parts of the in-hook core unwinder callable under unprivileged user - GDB core unwinder limits number of unwound frames - Fixed a pair of compile warnings - Chris Redmon -* Tue Jul 19 2016 Fedora Release Engineering - 0.21-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed May 18 2016 Matej Habrnal - 0.20-1 +* Wed May 18 2016 Matej Habrnal 0.21-1 - New upstream version - Introduce 'serial' field in uReport - normalization: actualize list of functions diff --git a/sources b/sources index 72e363d..b996210 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (satyr-0.25.tar.xz) = 7827ea637716238a2ca8ce99b7146479f35fb785f216fa6d46a3bcc7778b16b51b439bced3339bf4d365c2751da8ee34a477902ff8c2c8a8fe2449e747b7bcc0 +SHA512 (satyr-0.26.tar.xz) = 51f22d4ff7d3788e5edb99d37de5ab131dd66804a6d94b4042af1e7292ceaa557f4605be02ce0d7c92f6f84a1c8608b288416c64dba260d1073ef9c77b821a2e