diff --git a/satyr-0.27.tar.gz b/satyr-0.27.tar.gz deleted file mode 100644 index 9d2d147..0000000 Binary files a/satyr-0.27.tar.gz and /dev/null differ diff --git a/satyr-0.30.tar.gz b/satyr-0.30.tar.gz new file mode 100644 index 0000000..db7a81c Binary files /dev/null and b/satyr-0.30.tar.gz differ diff --git a/satyr.spec b/satyr.spec index 9a37776..b853af1 100644 --- a/satyr.spec +++ b/satyr.spec @@ -1,22 +1,17 @@ -%define with_python2 1 %define with_python3 1 Name: satyr -Version: 0.27 -Release: 5 +Version: 0.30 +Release: 1 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.gz +Source0: https://github.com/abrt/%{name}/archive/%{name}-%{version}.tar.gz -Patch9001: use-python2-explicitly-in-configure.patch - -BuildRequires: elfutils-devel elfutils-libelf-devel binutils-devel rpm-devel libtool -BuildRequires: doxygen pkgconfig automake gcc-c++ gdb git - -%if %{with_python2} -BuildRequires: python2-devel python2-sphinx -%endif +Requires: json-c nettle +BuildRequires: elfutils-devel elfutils-libelf-devel binutils-devel rpm-devel +BuildRequires: doxygen pkgconfig automake gcc-c++ gdb git libtool +BuildRequires: pkgconfig(json-c) satyr nettle nettle-devel gperf %if %{with_python3} BuildRequires: python3-devel python3-sphinx @@ -44,18 +39,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 @@ -75,9 +58,8 @@ python3 for satyr %prep %define __scm_apply_git(qp:m:) %{__git} am %autosetup -n %{name}-%{version} -p1 - +bash autogen.sh %build -./autogen.sh %configure --enable-doxygen-docs %make_build @@ -92,8 +74,9 @@ make check|| { exit 1 } -%ldconfig_scriptlets +cp -a %{_libdir}/libsatyr.so.3* %{buildroot}%{_libdir} +%ldconfig_scriptlets %files %defattr(-,root,root) %license COPYING @@ -106,10 +89,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 @@ -122,6 +102,9 @@ make check|| { %{_mandir}/* %changelog +* Mon Jul 27 2020 openEuler Buildteam - 0.30-1 +- update package + * Fri Feb 28 2020 hexiujun - 0.27-5 - Type:enhancement - Id:NA diff --git a/use-python2-explicitly-in-configure.patch b/use-python2-explicitly-in-configure.patch deleted file mode 100644 index 385e878..0000000 --- a/use-python2-explicitly-in-configure.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 23315167127777c5fbd2abcd2e4fb58382f37179 Mon Sep 17 00:00:00 2001 -From: hexiujun -Date: Fri, 28 Feb 2020 09:29:00 +0800 -Subject: [PATCH] use python2 explicitly in configure - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dca3c2d..9baa188 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -60,7 +60,7 @@ AC_ARG_WITH([python2], - AM_CONDITIONAL(WITH_PYTHON2, [test $with_python2 = yes]) - [if test "$with_python2" = "yes"] - [then] -- AC_PATH_PROG([PYTHON], [python], [no]) -+ AC_PATH_PROG([PYTHON], [python2], [no]) - [if test "$PYTHON" = "no"] - [then] - [echo "The python program was not found in the search path. Please ensure"] --- -1.8.3.1 -