!4 fix bug in new glibc version

Merge pull request !4 from chengquan/developer
This commit is contained in:
openeuler-ci-bot 2020-01-13 15:26:39 +08:00 committed by Gitee
commit e753a51435
2 changed files with 47 additions and 4 deletions

View File

@ -0,0 +1,38 @@
From a760fe1e4ee98808783a9833a022bf3ba77d47f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=B3=E7=A2=A7=E6=B9=96=E7=9A=84=E7=A0=8D=E6=9F=B4?=
=?UTF-8?q?=E4=BA=BA?= <chengquan3@huawei.com>
Date: Mon, 13 Jan 2020 14:33:04 +0800
Subject: [PATCH] tar2
---
libreport-2.10.1/src/gtk-helpers/Makefile.am | 1 -
libreport-2.10.1/src/gui-wizard-gtk/Makefile.am | 1 -
2 files changed, 2 deletions(-)
diff --git a/libreport-2.10.1/src/gtk-helpers/Makefile.am b/libreport-2.10.1/src/gtk-helpers/Makefile.am
index ad33750..c4a92dd 100644
--- a/src/gtk-helpers/Makefile.am
+++ b/src/gtk-helpers/Makefile.am
@@ -33,7 +33,6 @@ libreport_gtk_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
-DWORKFLOWS_DIR=\"$(WORKFLOWS_DIR)\" \
- -DGDK_DISABLE_DEPRECATION_WARNINGS \
-D_GNU_SOURCE
libreport_gtk_la_LDFLAGS = \
-version-info 0:1:0
diff --git a/libreport-2.10.1/src/gui-wizard-gtk/Makefile.am b/libreport-2.10.1/src/gui-wizard-gtk/Makefile.am
index fce33cb..37e7ba6 100644
--- a/src/gui-wizard-gtk/Makefile.am
+++ b/src/gui-wizard-gtk/Makefile.am
@@ -22,7 +22,6 @@ report_gtk_CFLAGS = \
-DICON_DIR=\"${datadir}/abrt/icons/hicolor/48x48/status\" \
-DWORKFLOWS_DIR=\"$(WORKFLOWS_DIR)\" \
-DLIBEXEC_DIR=\"$(libexecdir)\" \
- -DGDK_DISABLE_DEPRECATION_WARNINGS \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
-D_GNU_SOURCE
--
1.8.3.1

View File

@ -2,12 +2,14 @@
Name: libreport Name: libreport
Version: 2.10.1 Version: 2.10.1
Release: 4 Release: 5
License: GPLv2+ License: GPLv2+
Summary: Generic library for reporting various problems Summary: Generic library for reporting various problems
URL: https://abrt.readthedocs.org/ URL: https://abrt.readthedocs.org/
Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
Patch9000: fix-bug-delete-gtk-deprecation-warnings.patch
BuildRequires: dbus-devel gtk3-devel curl-devel desktop-file-utils python2-devel python3-devel BuildRequires: dbus-devel gtk3-devel curl-devel desktop-file-utils python2-devel python3-devel
BuildRequires: gettext libxml2-devel libtar-devel intltool libtool texinfo asciidoc xmlto BuildRequires: gettext libxml2-devel libtar-devel intltool libtool texinfo asciidoc xmlto
BuildRequires: newt-devel libproxy-devel satyr-devel >= 0.24 glib2-devel >= 2.43 git doxygen BuildRequires: newt-devel libproxy-devel satyr-devel >= 0.24 glib2-devel >= 2.43 git doxygen
@ -24,7 +26,6 @@ Requires: libreport = %{version}-%{release}
Requires: fros >= 1.0 Requires: fros >= 1.0
Requires: curl Requires: curl
Provides: %{name}-filesystem Provides: %{name}-filesystem
Obsoletes: %{name}-filesystem Obsoletes: %{name}-filesystem
@ -125,13 +126,14 @@ Default configuration for reporting bugs via Red Hat infrastructure.
It is used to easily configure the reporting process for Red Hat systems. It is used to easily configure the reporting process for Red Hat systems.
%package_help %package_help
%prep %prep
%autosetup -n %{name}-%{version} -p1 -S git %autosetup -n %{name}-%{version} -p1
%build %build
./autogen.sh ./autogen.sh
CFLAGS="%{optflags} -Werror" CFLAGS="%{optflags}"
%configure --enable-import-rhtsupport-cert --enable-doxygen-docs --disable-silent-rules %configure --enable-import-rhtsupport-cert --enable-doxygen-docs --disable-silent-rules
%make_build %make_build
@ -399,6 +401,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/report_rhel.conf.5.* %{_mandir}/man5/report_rhel.conf.5.*
%changelog %changelog
* Mon Jan 13 2020 chengquan <chengquan3@huawei.com> - 2.10.1-5
- fix bug in new glibc version
* Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.10.1-4 * Tue Dec 31 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.10.1-4
- Update tar package - Update tar package