update version

This commit is contained in:
19909236985 2021-02-02 21:07:59 +08:00
parent db24c8e953
commit 90d01f7ba5
4 changed files with 54 additions and 69 deletions

View File

@ -9,19 +9,19 @@ Subject: [PATCH] tar2
libreport-2.10.1/src/gui-wizard-gtk/Makefile.am | 1 - libreport-2.10.1/src/gui-wizard-gtk/Makefile.am | 1 -
2 files changed, 2 deletions(-) 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 diff --git a/src/gtk-helpers/Makefile.am b/src/gtk-helpers/Makefile.am
index ad33750..c4a92dd 100644 index 7d916cc..808d701 100644
--- a/src/gtk-helpers/Makefile.am --- a/src/gtk-helpers/Makefile.am
+++ b/src/gtk-helpers/Makefile.am +++ b/src/gtk-helpers/Makefile.am
@@ -33,7 +33,6 @@ libreport_gtk_la_CPPFLAGS = \ @@ -34,7 +34,6 @@ libreport_gtk_la_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(GIO_CFLAGS) \ $(GIO_CFLAGS) \
-DWORKFLOWS_DIR=\"$(WORKFLOWS_DIR)\" \ -DWORKFLOWS_DIR=\"$(WORKFLOWS_DIR)\" \
- -DGDK_DISABLE_DEPRECATION_WARNINGS \ - -DGDK_DISABLE_DEPRECATION_WARNINGS \
-D_GNU_SOURCE -D_GNU_SOURCE
libreport_gtk_la_LDFLAGS = \ libreport_gtk_la_LDFLAGS = \
-version-info 0:1:0 -version-info 1:0: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 diff --git a/src/gui-wizard-gtk/Makefile.am b/src/gui-wizard-gtk/Makefile.am
index fce33cb..37e7ba6 100644 index fce33cb..37e7ba6 100644
--- a/src/gui-wizard-gtk/Makefile.am --- a/src/gui-wizard-gtk/Makefile.am
+++ b/src/gui-wizard-gtk/Makefile.am +++ b/src/gui-wizard-gtk/Makefile.am

Binary file not shown.

BIN
libreport-2.14.0.tar.gz Normal file

Binary file not shown.

View File

@ -1,8 +1,8 @@
%define _unpackaged_files_terminate_build 0 %define _unpackaged_files_terminate_build 0
Name: libreport Name: libreport
Version: 2.13.1 Version: 2.14.0
Release: 3 Release: 1
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/
@ -14,9 +14,8 @@ BuildRequires: dbus-devel gtk3-devel curl-devel desktop-file-utils 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-core doxygen BuildRequires: newt-devel libproxy-devel satyr-devel >= 0.24 glib2-devel >= 2.43 git-core doxygen
BuildRequires: glibc-all-langpacks xmlrpc-c-devel systemd-devel augeas-devel augeas xz lz4 BuildRequires: glibc-all-langpacks xmlrpc-c-devel systemd-devel augeas-devel augeas xz lz4
BuildRequires: sed json-c-devel gdb nettle-devel BuildRequires: sed json-c-devel gdb nettle-devel libarchive-devel
Requires: libreport-filesystem = %{version}-%{release}
Requires: satyr >= 0.24 Requires: satyr >= 0.24
Requires: glib2 >= 2.43 Requires: glib2 >= 2.43
Requires: xz Requires: xz
@ -25,51 +24,55 @@ Requires: libreport = %{version}-%{release}
Requires: fros >= 1.0 Requires: fros >= 1.0
Requires: curl Requires: curl
Requires: nettle Requires: nettle
Requires: libarchive
Provides: %{name}-web = %{version}-%{release} Provides: %{name}-filesystem
Obsoletes: %{name}-web < %{version}-%{release} Obsoletes: %{name}-filesystem
Provides: %{name}-cli = %{version}-%{release} Provides: %{name}-web
Obsoletes: %{name}-cli < %{version}-%{release} Obsoletes: %{name}-web
Provides: %{name}-cli
Obsoletes: %{name}-cli
Provides: report-newt = 0:0.23-1 Provides: report-newt = 0:0.23-1
Obsoletes: report-newt < 0:0.23-1 Obsoletes: report-newt < 0:0.23-1
Provides: %{name}-newt = %{version}-%{release} Provides: %{name}-newt
Obsoletes: %{name}-newt < %{version}-%{release} Obsoletes: %{name}-newt
Provides: report-gtk = 0:0.23-1 Provides: report-gtk = 0:0.23-1
Obsoletes: report-gtk < 0:0.23-1 Obsoletes: report-gtk < 0:0.23-1
Provides: %{name}-gtk = %{version}-%{release} Provides: %{name}-gtk
Obsoletes: %{name}-gtk < %{version}-%{release} Obsoletes: %{name}-gtk
Provides: %{name}-plugin-kerneloops = %{version}-%{release} Provides: %{name}-plugin-kerneloops
Obsoletes: %{name}-plugin-kerneloops < %{version}-%{release} Obsoletes: %{name}-plugin-kerneloops
Provides: %{name}-plugin-logger = %{version}-%{release} Provides: %{name}-plugin-logger
Obsoletes: %{name}-plugin-logger < %{version}-%{release} Obsoletes: %{name}-plugin-logger
Provides: %{name}-plugin-systemd-journal = %{version}-%{release} Provides: %{name}-plugin-systemd-journal
Obsoletes: %{name}-plugin-systemd-journal < %{version}-%{release} Obsoletes: %{name}-plugin-systemd-journal
Obsoletes: %{name}-plugin-ureport < %{version}-%{release} Obsoletes: %{name}-plugin-ureport
Obsoletes: %{name}-plugin-bugzilla < %{version}-%{release} Obsoletes: %{name}-plugin-bugzilla
Provides: %{name}-plugin-mantisbt = %{version}-%{release} Provides: %{name}-plugin-mantisbt
Obsoletes: %{name}-plugin-mantisbt < %{version}-%{release} Obsoletes: %{name}-plugin-mantisbt
Obsoletes: %{name}-plugin-rhtsupport < %{version}-%{release} Obsoletes: %{name}-plugin-rhtsupport
Provides: %{name}-compat = %{version}-%{release} Provides: %{name}-compat
Obsoletes: %{name}-compat < %{version}-%{release} Obsoletes: %{name}-compat
Provides: %{name}-plugin-reportuploader = %{version}-%{release} Provides: %{name}-plugin-reportuploader
Obsoletes: %{name}-plugin-reportuploader < %{version}-%{release} Obsoletes: %{name}-plugin-reportuploader
Provides: %{name}-anaconda = %{version}-%{release} Provides: %{name}-anaconda
Obsoletes: %{name}-anaconda < %{version}-%{release} Obsoletes: %{name}-anaconda
%description %description
Generic library for reporting various problems to destinations like mailing lists, regular files, remote servers and bug tracking tools. Generic library for reporting various problems to destinations like mailing lists, regular files, remote servers and bug tracking tools.
@ -77,22 +80,15 @@ The library operates on problem data stored in the form of regular files in a di
The library provides a low level API (dump_dir.h) for creating and modifying dump directories, a high level API allowing to avoid the need to work with dump directories (problem_data.h), and a set of tools that file reports. The library provides a low level API (dump_dir.h) for creating and modifying dump directories, a high level API allowing to avoid the need to work with dump directories (problem_data.h), and a set of tools that file reports.
The library also provides an infrastructure (run_event.h, report_event.conf) for automatic execution of shell scripts working with dump directories. The library also provides an infrastructure (run_event.h, report_event.conf) for automatic execution of shell scripts working with dump directories.
%package filesystem
Summary: Filesystem layout for libreport
BuildArch: noarch
%description filesystem
Filesystem layout for libreport
%package devel %package devel
Summary: Development libraries and headers for libreport Summary: Development libraries and headers for libreport
Requires: libreport = %{version}-%{release} Requires: libreport = %{version}-%{release}
Provides: %{name}-web-devel = %{version}-%{release} Provides: %{name}-web-devel
Obsoletes: %{name}-web-devel < %{version}-%{release} Obsoletes: %{name}-web-devel
Provides: %{name}-gtk-devel = %{version}-%{release} Provides: %{name}-gtk-devel
Obsoletes: %{name}-gtk-devel < %{version}-%{release} Obsoletes: %{name}-gtk-devel
%description devel %description devel
Development libraries and headers for libreport Development libraries and headers for libreport
@ -169,6 +165,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/%{name}/conf.d/libreport.conf %{_datadir}/%{name}/conf.d/libreport.conf
%{_libdir}/libreport.so.* %{_libdir}/libreport.so.*
%{_datadir}/augeas/lenses/libreport.aug %{_datadir}/augeas/lenses/libreport.aug
#filesystem
%dir %{_sysconfdir}/%{name}/
%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/
#web #web
%{_libdir}/libreport-web.so.* %{_libdir}/libreport-web.so.*
#cli #cli
@ -205,7 +212,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/reporter-mantisbt %{_bindir}/reporter-mantisbt
#compat #compat
%{_bindir}/report #%{_bindir}/report
#plugin-reportuploader #plugin-reportuploader
%{_bindir}/reporter-upload %{_bindir}/reporter-upload
@ -226,18 +233,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_anaconda.conf
%config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup_anaconda.conf %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_formatdup_anaconda.conf
%files filesystem
%dir %{_sysconfdir}/%{name}/
%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/
%files devel %files devel
# Public api headers: # Public api headers:
%doc apidoc/html/*.{html,png,css,js} %doc apidoc/html/*.{html,png,css,js}
@ -296,15 +291,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/mantisbt_formatdup.conf.5.* %{_mandir}/man5/mantisbt_formatdup.conf.5.*
%{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.* %{_mandir}/man5/mantisbt_format_analyzer_libreport.conf.5.*
%{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.* %{_mandir}/man5/mantisbt_formatdup_analyzer_libreport.conf.5.*
%{_mandir}/man1/reporter-rhtsupport.1.gz
%{_mandir}/man5/rhtsupport.conf.5.*
%{_mandir}/man5/rhtsupport_event.conf.5.*
%{_mandir}/man1/report.1.gz
%{_mandir}/man*/reporter-upload.* %{_mandir}/man*/reporter-upload.*
%{_mandir}/man5/uploader_event.conf.5.* %{_mandir}/man5/uploader_event.conf.5.*
%{_mandir}/man1/reporter-rhtsupport.1.gz
%{_mandir}/man5/rhtsupport.conf.5.*
%{_mandir}/man5/rhtsupport_event.conf.5.*
%{_mandir}/man5/anaconda_event.conf.5.* %{_mandir}/man5/anaconda_event.conf.5.*
%{_mandir}/man5/bugzilla_anaconda_event.conf.5.* %{_mandir}/man5/bugzilla_anaconda_event.conf.5.*
%{_mandir}/man5/bugzilla_format_anaconda.conf.5.* %{_mandir}/man5/bugzilla_format_anaconda.conf.5.*
@ -321,12 +309,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man5/bugzilla_formatdup.conf.5.* %{_mandir}/man5/bugzilla_formatdup.conf.5.*
%{_mandir}/man5/bugzilla_format_analyzer_libreport.conf.5.* %{_mandir}/man5/bugzilla_format_analyzer_libreport.conf.5.*
%{_mandir}/man5/bugzilla_format_kernel.conf.5.* %{_mandir}/man5/bugzilla_format_kernel.conf.5.*
%{_mandir}/man5/report_rhel.conf.5.* #%{_mandir}/man5/report_rhel.conf.5.*
%changelog %changelog
* Sat Jan 09 2021 shixuantong <shixuantong@huawei.com> - 2.13.1-3
- Split filesystem package and add version limit for some provides symbol
* Fri Aug 21 2020 shixuantong <shixuantong@huawei.com> - 2.13.1-2 * Fri Aug 21 2020 shixuantong <shixuantong@huawei.com> - 2.13.1-2
- sovle nothing provides libreport-python3 problem - sovle nothing provides libreport-python3 problem