Rebuilt for libjson-c.so.3
This commit is contained in:
Björn Esser
parent
85802ca9d7
commit
37ad20102e
39
abrt-2.10.5_json-c_013.patch
Normal file
39
abrt-2.10.5_json-c_013.patch
Normal file
@ -0,0 +1,39 @@
|
||||
From 395bbb2cbd9a12ff11068ea29922e1575d4d93b3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||
Date: Sun, 10 Dec 2017 22:59:33 +0100
|
||||
Subject: [PATCH] Fix build against libjson-c.so.3
|
||||
|
||||
---
|
||||
src/daemon/abrt-action-save-container-data.c | 2 +-
|
||||
src/plugins/bodhi.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/daemon/abrt-action-save-container-data.c b/src/daemon/abrt-action-save-container-data.c
|
||||
index 5d8cdb7..9a5bfa4 100644
|
||||
--- a/src/daemon/abrt-action-save-container-data.c
|
||||
+++ b/src/daemon/abrt-action-save-container-data.c
|
||||
@@ -141,7 +141,7 @@ void dump_docker_info(struct dump_dir *dd, const char *root_dir)
|
||||
json = json_tokener_parse(output);
|
||||
free(output);
|
||||
|
||||
- if (is_error(json))
|
||||
+ if (json == NULL)
|
||||
{
|
||||
error_msg("Unable parse response from docker");
|
||||
goto dump_docker_info_cleanup;
|
||||
diff --git a/src/plugins/bodhi.c b/src/plugins/bodhi.c
|
||||
index 84ed4d8..14d65ad 100644
|
||||
--- a/src/plugins/bodhi.c
|
||||
+++ b/src/plugins/bodhi.c
|
||||
@@ -419,7 +419,7 @@ static GHashTable *bodhi_query_list(const char *query, const char *release)
|
||||
// log_warning("%s", post_state->body);
|
||||
|
||||
json_object *json = json_tokener_parse(post_state->body);
|
||||
- if (is_error(json))
|
||||
+ if (json == NULL)
|
||||
error_msg_and_die("fatal: unable parse response from bodhi server");
|
||||
|
||||
/* we must check the http_resp_code because only error responses contain
|
||||
--
|
||||
2.15.1
|
||||
|
||||
41
abrt.spec
41
abrt.spec
@ -1,7 +1,3 @@
|
||||
%{!?python_site: %global python_site %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")}
|
||||
# platform-dependent
|
||||
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
# http://fedoraproject.org/wiki/Packaging:Guidelines#PIE
|
||||
# http://fedoraproject.org/wiki/Hardened_Packages
|
||||
%global _hardened_build 1
|
||||
@ -25,23 +21,23 @@
|
||||
%bcond_without atomic
|
||||
|
||||
%ifarch aarch64
|
||||
%define have_kexec_tools 0
|
||||
%global have_kexec_tools 0
|
||||
%else
|
||||
%define have_kexec_tools 1
|
||||
%global have_kexec_tools 1
|
||||
%endif
|
||||
|
||||
# rpmbuild --define 'desktopvendor mystring'
|
||||
%if "x%{desktopvendor}" == "x"
|
||||
%if %{with systemd}
|
||||
%define desktopvendor %(source /etc/os-release; echo ${ID})
|
||||
%global desktopvendor %(source /etc/os-release; echo ${ID})
|
||||
%else
|
||||
%if 0%{?rhel} >= 6
|
||||
%define desktopvendor redhat
|
||||
%global desktopvendor redhat
|
||||
%else
|
||||
%if 0%{?suse_version}
|
||||
%define desktopvendor suse
|
||||
%global desktopvendor suse
|
||||
%else
|
||||
%define desktopvendor fedora
|
||||
%global desktopvendor fedora
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
@ -49,23 +45,27 @@
|
||||
|
||||
# do not append package version to doc directory of subpackages in F20 and later; rhbz#993656
|
||||
%if "%{_pkgdocdir}" == "%{_docdir}/%{name}"
|
||||
%define docdirversion %{nil}
|
||||
%global docdirversion %{nil}
|
||||
%else
|
||||
%define docdirversion -%{version}
|
||||
%global docdirversion -%{version}
|
||||
%endif
|
||||
|
||||
%define libreport_ver 2.9.3
|
||||
%define satyr_ver 0.24
|
||||
%global libreport_ver 2.9.3
|
||||
%global satyr_ver 0.24
|
||||
|
||||
Summary: Automatic bug detection and reporting tool
|
||||
Name: abrt
|
||||
Version: 2.10.5
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
URL: https://abrt.readthedocs.org/
|
||||
Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# Needed for libjson-c.so.3*.
|
||||
# See: https://github.com/json-c/json-c/issues/304
|
||||
Patch0: abrt-2.10.5_json-c_013.patch
|
||||
|
||||
# git format-patch %%{Version} --topo-order -N -M;
|
||||
# i=1; for p in `ls 0*.patch`; do printf "Patch%04d: %s\n" $i $p; ((i++)); done
|
||||
|
||||
@ -542,9 +542,9 @@ to the shell
|
||||
# Default '__scm_apply_git' is 'git apply && git commit' but this workflow
|
||||
# doesn't allow us to create a new file within a patch, so we have to use
|
||||
# 'git am' (see /usr/lib/rpm/macros for more details)
|
||||
#%%define __scm_apply_git(qp:m:) %%{__git} am
|
||||
%define __scm_apply_git(qp:m:) %{__git} am --exclude doc/design --exclude doc/project/abrt.tex
|
||||
%autosetup -S git
|
||||
#%%global __scm_apply_git(qp:m:) %%{__git} am
|
||||
%global __scm_apply_git(qp:m:) %{__git} am --exclude doc/design --exclude doc/project/abrt.tex
|
||||
%autosetup -S git -p 1
|
||||
|
||||
%build
|
||||
autoreconf --force --install
|
||||
@ -605,7 +605,7 @@ make check
|
||||
|
||||
%pre
|
||||
#uidgid pair 173:173 reserved in setup rhbz#670231
|
||||
%define abrt_gid_uid 173
|
||||
%global abrt_gid_uid 173
|
||||
getent group abrt >/dev/null || groupadd -f -g %{abrt_gid_uid} --system abrt
|
||||
getent passwd abrt >/dev/null || useradd --system -g abrt -u %{abrt_gid_uid} -d /etc/abrt -s /sbin/nologin abrt
|
||||
exit 0
|
||||
@ -1166,6 +1166,9 @@ killall abrt-dbus >/dev/null 2>&1 || :
|
||||
%config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
|
||||
|
||||
%changelog
|
||||
* Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 2.10.5-2
|
||||
- Rebuilt for libjson-c.so.3
|
||||
|
||||
* Thu Nov 02 2017 Julius Milan <jmilan@redhat.com> 2.10.5-1
|
||||
- Translation updates
|
||||
- a-action-ureport: add option 'ProcessUnpackaged'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user