diff --git a/satyr.spec b/satyr.spec index 09f18a0..cf09f2e 100644 --- a/satyr.spec +++ b/satyr.spec @@ -1,4 +1,3 @@ -%define with_python2 1 %define with_python3 1 Name: satyr @@ -7,15 +6,14 @@ Release: 0 Summary: Tools to create anonymous, machine-friendly problem reports License: GPLv2+ URL: https://github.com/abrt/satyr -Source0: https://github.com/abrt/satyr/archive/%{version}.tar.gz -Patch9001: use-python2-explicitly-in-configure.patch +Source0: https://github.com/abrt/%{name}/archive/%{name}-%{version}.tar.gz -BuildRequires: elfutils-devel elfutils-libelf-devel binutils-devel rpm-devel libtool +Requires: json-c nettle +BuildRequires: elfutils-devel elfutils-libelf-devel binutils-devel rpm-devel libtool gperf BuildRequires: doxygen pkgconfig automake gcc-c++ gdb git +BuildRequires: pkgconfig(json-c) +BuildRequires: nettle nettle-devel -%if %{with_python2} -BuildRequires: python2-devel python2-sphinx -%endif %if %{with_python3} BuildRequires: python3-devel python3-sphinx @@ -43,18 +41,6 @@ Requires: %{name} = %{version}-%{release} %description devel Header files for satyr. -%if %{with_python2} -%package -n python2-satyr -Summary: python2 for satyr -Requires: %{name} = %{version}-%{release} -Provides: %{name}-python = %{version}-%{release} -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < 0.24 -%{?python_provide:%python_provide python2-satyr} - -%description -n python2-satyr -python2 for satyr -%endif %if %{with_python3} %package -n python3-satyr @@ -73,10 +59,9 @@ python3 for satyr %prep %define __scm_apply_git(qp:m:) %{__git} am -%autosetup -n satyr-%{version} -p1 - +%autosetup -n %{name}-%{version} -p1 +bash autogen.sh %build -./autogen.sh %configure --enable-doxygen-docs %make_build @@ -105,10 +90,7 @@ make check|| { %{_libdir}/lib*.so %{_libdir}/pkgconfig/* -%if %{with_python2} -%files -n python2-satyr -%{python2_sitearch}/* -%endif + %if %{with_python3} %files -n python3-satyr