New upstream release 2.9.4
Signed-off-by: Martin Kutlak <mkutlak@redhat.com>
This commit is contained in:
Martin Kutlak
parent
eba2d1c7fa
commit
59fdf2c79f
@ -1,25 +0,0 @@
|
||||
From ad6b52edd4c36b413d3bac6cb03f35369dae1d28 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||
Date: Sun, 10 Dec 2017 20:20:21 +0100
|
||||
Subject: [PATCH 2/2] Fix build against libjson-c.so.3
|
||||
|
||||
---
|
||||
src/lib/ureport.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/lib/ureport.c b/src/lib/ureport.c
|
||||
index 9e8bbd6..81f0791 100644
|
||||
--- a/src/lib/ureport.c
|
||||
+++ b/src/lib/ureport.c
|
||||
@@ -609,7 +609,7 @@ ureport_server_response_from_reply(post_state_t *post_state,
|
||||
|
||||
json_object *const json = json_tokener_parse(post_state->body);
|
||||
|
||||
- if (is_error(json))
|
||||
+ if (json == NULL)
|
||||
{
|
||||
error_msg(_("Unable to parse response from ureport server at '%s'"), config->ur_url);
|
||||
log_notice("%s", post_state->body);
|
||||
--
|
||||
2.15.1
|
||||
|
||||
@ -3,16 +3,13 @@
|
||||
|
||||
Summary: Generic library for reporting various problems
|
||||
Name: libreport
|
||||
Version: 2.9.3
|
||||
Release: 8%{?dist}
|
||||
Version: 2.9.4
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
URL: https://abrt.readthedocs.org/
|
||||
Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
Source1: autogen.sh
|
||||
|
||||
# Needed for libjson-c.so.3*.
|
||||
# See: https://github.com/json-c/json-c/issues/304
|
||||
Patch0: libreport-2.9.3_fix_json-c_013.patch
|
||||
|
||||
# git format-patch %%{Version} -N -M --topo-order
|
||||
# i=0; for p in `ls 0*.patch`; do printf "Patch%04d: %s\n" $i $p; ((i++)); done
|
||||
@ -96,11 +93,6 @@ Development headers for libreport-web
|
||||
Summary: Python bindings for report-libs
|
||||
Requires: libreport = %{version}-%{release}
|
||||
Requires: python2-dnf
|
||||
# in report the rhtsupport is in the main package, so we need to install it too
|
||||
# report is only in RHEL6, we do not need to carry the dependency to newer RHELs
|
||||
%if 0%{?rhel} == 6
|
||||
Requires: libreport-plugin-rhtsupport = %{version}-%{release}
|
||||
%endif
|
||||
%{?python_provide:%python_provide python2-libreport}
|
||||
# Remove before F30
|
||||
Provides: %{name}-python = %{version}-%{release}
|
||||
@ -340,7 +332,11 @@ cp %SOURCE1 %_builddir/%{name}-%{version}
|
||||
%build
|
||||
# Commented because of deprecated GTK API
|
||||
#CFLAGS="%%{optflags} -Werror" %%configure --disable-silent-rules
|
||||
CFLAGS="%{optflags}" %configure --enable-doxygen-docs --disable-silent-rules
|
||||
CFLAGS="%{optflags}" %configure --enable-doxygen-docs \
|
||||
%if 0%{?rhel}
|
||||
--enable-import-rhtsupport-cert \
|
||||
%endif
|
||||
--disable-silent-rules
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -435,7 +431,6 @@ make check|| {
|
||||
%ldconfig_scriptlets web
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc README.md
|
||||
%license COPYING
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/libreport.conf
|
||||
@ -457,6 +452,9 @@ make check|| {
|
||||
%dir %{_sysconfdir}/%{name}/events.d/
|
||||
%dir %{_sysconfdir}/%{name}/events/
|
||||
%dir %{_sysconfdir}/%{name}/workflows.d/
|
||||
%dir %{_datadir}/%{name}/
|
||||
%dir %{_datadir}/%{name}/conf.d/
|
||||
%dir %{_datadir}/%{name}/conf.d/plugins/
|
||||
%dir %{_datadir}/%{name}/events/
|
||||
%dir %{_datadir}/%{name}/workflows/
|
||||
%dir %{_sysconfdir}/%{name}/plugins/
|
||||
@ -500,12 +498,12 @@ make check|| {
|
||||
%{_libdir}/pkgconfig/libreport-web.pc
|
||||
|
||||
%files -n python2-libreport
|
||||
%{python_sitearch}/report
|
||||
%{python_sitearch}/reportclient
|
||||
%{python_sitearch}/report/
|
||||
%{python_sitearch}/reportclient/
|
||||
|
||||
%files -n python3-libreport
|
||||
%{python3_sitearch}/report
|
||||
%{python3_sitearch}/reportclient
|
||||
%{python3_sitearch}/report/
|
||||
%{python3_sitearch}/reportclient/
|
||||
|
||||
%files cli
|
||||
%{_bindir}/report-cli
|
||||
@ -637,6 +635,9 @@ make check|| {
|
||||
%{_datadir}/%{name}/events/report_RHTSupport.xml
|
||||
%{_datadir}/%{name}/events/report_RHTSupport_AddData.xml
|
||||
%{_datadir}/dbus-1/interfaces/com.redhat.problems.configuration.rhtsupport.xml
|
||||
%if 0%{?rhel}
|
||||
%attr(600,root,root)%{_sysconfdir}/%{name}/cert-api.access.redhat.com.pem
|
||||
%endif
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/rhtsupport_event.conf
|
||||
%{_mandir}/man1/reporter-rhtsupport.1.gz
|
||||
%{_mandir}/man5/rhtsupport.conf.5.*
|
||||
@ -738,6 +739,17 @@ make check|| {
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Mar 27 2018 Martin Kutlak <mkutlak@redhat.com> - 2.9.4-1
|
||||
- Translation updates
|
||||
- ureport: remove json-c is_error() usage
|
||||
- reporter-rhtsupport: Remove dependency on redhat-access-insights
|
||||
- reporter-mailx: rely on configured email
|
||||
- Modernize spec file
|
||||
- augeas: include local config path
|
||||
- doc: update to contain newly added user's local config
|
||||
- reporter-{mantisbt,rhtsupport,bugzilla}: read configuration from user's home
|
||||
- reporter-bugzilla: ask concrete bz when requiring login
|
||||
|
||||
* Tue Mar 06 2018 Björn Esser <besser82@fedoraproject.org> - 2.9.3-8
|
||||
- Rebuilt for libjson-c.so.4 (json-c v0.13.1)
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (libreport-2.9.3.tar.gz) = f4cdf6a0ffb18db224f47391e0e8ac26491ac105051ec511e575b10a1ffbbbaa2290827ad27cc622ece5d5291141cf1083dce0d3b778657d309aa8d5d8799473
|
||||
SHA512 (libreport-2.9.4.tar.gz) = 060e8d2929397a48f8c213758eff06583afbdc77cdfa186999b35dc545076890f0112b190df635c9681565c4ccbee1be7653a31a702dc612e15703d273d9039f
|
||||
|
||||
Loading…
Reference in New Issue
Block a user