diff --git a/fix-bug-delete-gtk-deprecation-warnings.patch b/fix-bug-delete-gtk-deprecation-warnings.patch index 9ef7babdaf0de623c6bc77b462114f9b14fd185e..65faa49fa0b82fe99adff9cd155035d251e0cf92 100644 --- a/fix-bug-delete-gtk-deprecation-warnings.patch +++ b/fix-bug-delete-gtk-deprecation-warnings.patch @@ -9,19 +9,19 @@ Subject: [PATCH] tar2 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 +diff --git a/src/gtk-helpers/Makefile.am b/src/gtk-helpers/Makefile.am +index 7d916cc..808d701 100644 --- a/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) \ $(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 + -version-info 1:0:0 +diff --git a/src/gui-wizard-gtk/Makefile.am b/src/gui-wizard-gtk/Makefile.am index fce33cb..37e7ba6 100644 --- a/src/gui-wizard-gtk/Makefile.am +++ b/src/gui-wizard-gtk/Makefile.am diff --git a/libreport-2.10.1.tar.gz b/libreport-2.10.1.tar.gz deleted file mode 100644 index d8a073104ff76a08a31b7e8bb0c0bee34049c4b5..0000000000000000000000000000000000000000 Binary files a/libreport-2.10.1.tar.gz and /dev/null differ diff --git a/libreport-2.14.0.tar.gz b/libreport-2.14.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..cbfe4b8420f7135b7fd85b3706d00c58f4cea1ef Binary files /dev/null and b/libreport-2.14.0.tar.gz differ diff --git a/libreport.spec b/libreport.spec index d05f4f77e857091f7541e13424ab5b625fac27f5..08672e1fb941b27fe1b7b6fe3c7961c1fe836ce1 100644 --- a/libreport.spec +++ b/libreport.spec @@ -1,9 +1,8 @@ %define _unpackaged_files_terminate_build 0 -%bcond_with python2_libreport Name: libreport -Version: 2.10.1 -Release: 8 +Version: 2.14.0 +Release: 1 License: GPLv2+ Summary: Generic library for reporting various problems URL: https://abrt.readthedocs.org/ @@ -11,12 +10,13 @@ Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.t 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 python3-devel 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-core doxygen BuildRequires: glibc-all-langpacks xmlrpc-c-devel systemd-devel augeas-devel augeas xz lz4 -BuildRequires: sed json-c-devel gdb +BuildRequires: sed json-c-devel gdb nettle-devel +Requires: libreport-filesystem = %{version}-%{release} Requires: satyr >= 0.24 Requires: glib2 >= 2.43 Requires: xz @@ -24,58 +24,52 @@ Requires: lz4 Requires: libreport = %{version}-%{release} Requires: fros >= 1.0 Requires: curl +Requires: nettle -Provides: %{name}-filesystem -Obsoletes: %{name}-filesystem +Provides: %{name}-web = %{version}-%{release} +Obsoletes: %{name}-web < %{version}-%{release} -Provides: %{name}-web -Obsoletes: %{name}-web - -Provides: %{name}-cli -Obsoletes: %{name}-cli +Provides: %{name}-cli = %{version}-%{release} +Obsoletes: %{name}-cli < %{version}-%{release} Provides: report-newt = 0:0.23-1 Obsoletes: report-newt < 0:0.23-1 -Provides: %{name}-newt -Obsoletes: %{name}-newt +Provides: %{name}-newt = %{version}-%{release} +Obsoletes: %{name}-newt < %{version}-%{release} Provides: report-gtk = 0:0.23-1 Obsoletes: report-gtk < 0:0.23-1 -Provides: %{name}-gtk -Obsoletes: %{name}-gtk - -Provides: %{name}-plugin-kerneloops -Obsoletes: %{name}-plugin-kerneloops +Provides: %{name}-gtk = %{version}-%{release} +Obsoletes: %{name}-gtk < %{version}-%{release} -Provides: %{name}-plugin-logger -Obsoletes: %{name}-plugin-logger +Provides: %{name}-plugin-kerneloops = %{version}-%{release} +Obsoletes: %{name}-plugin-kerneloops < %{version}-%{release} -Provides: %{name}-plugin-systemd-journal -Obsoletes: %{name}-plugin-systemd-journal +Provides: %{name}-plugin-logger = %{version}-%{release} +Obsoletes: %{name}-plugin-logger < %{version}-%{release} -Obsoletes: %{name}-plugin-ureport +Provides: %{name}-plugin-systemd-journal = %{version}-%{release} +Obsoletes: %{name}-plugin-systemd-journal < %{version}-%{release} -Obsoletes: %{name}-plugin-bugzilla +Obsoletes: %{name}-plugin-ureport < %{version}-%{release} -Provides: %{name}-plugin-mantisbt -Obsoletes: %{name}-plugin-mantisbt +Obsoletes: %{name}-plugin-bugzilla < %{version}-%{release} -Obsoletes: %{name}-plugin-rhtsupport +Provides: %{name}-plugin-mantisbt = %{version}-%{release} +Obsoletes: %{name}-plugin-mantisbt < %{version}-%{release} -Provides: %{name}-compat -Obsoletes: %{name}-compat +Obsoletes: %{name}-plugin-rhtsupport < %{version}-%{release} -Provides: %{name}-plugin-reportuploader -Obsoletes: %{name}-plugin-reportuploader +Provides: %{name}-compat = %{version}-%{release} +Obsoletes: %{name}-compat < %{version}-%{release} -Provides: %{name}-anaconda -Obsoletes: %{name}-anaconda +Provides: %{name}-plugin-reportuploader = %{version}-%{release} +Obsoletes: %{name}-plugin-reportuploader < %{version}-%{release} -%if %{without python2_libreport} -Obsoletes: python2-libreport -%endif +Provides: %{name}-anaconda = %{version}-%{release} +Obsoletes: %{name}-anaconda < %{version}-%{release} %description Generic library for reporting various problems to destinations like mailing lists, regular files, remote servers and bug tracking tools. @@ -83,31 +77,26 @@ 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 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 Summary: Development libraries and headers for libreport Requires: libreport = %{version}-%{release} -Provides: %{name}-web-devel -Obsoletes: %{name}-web-devel +Provides: %{name}-web-devel = %{version}-%{release} +Obsoletes: %{name}-web-devel < %{version}-%{release} -Provides: %{name}-gtk-devel -Obsoletes: %{name}-gtk-devel +Provides: %{name}-gtk-devel = %{version}-%{release} +Obsoletes: %{name}-gtk-devel < %{version}-%{release} %description devel Development libraries and headers for libreport -%if %{with python2_libreport} -%package -n python2-libreport -Summary: Python2 bindings for report-libs -Requires: libreport = %{version}-%{release} -Requires: python2-dnf -Provides: %{name}-python = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} - -%description -n python2-libreport -Python bindings for report-libs. -%endif - %package -n python3-libreport Summary: Python3 bindings for report-libs Requires: libreport = %{version}-%{release} @@ -179,19 +168,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/%{name}/ignored_words.conf %{_datadir}/%{name}/conf.d/libreport.conf %{_libdir}/libreport.so.* -%{_libdir}/libabrt_dbus.so.* %{_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 %{_libdir}/libreport-web.so.* #cli @@ -201,8 +178,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #gtk %{_bindir}/report-gtk %{_libdir}/libreport-gtk.so.* -%config(noreplace) %{_sysconfdir}/libreport/events.d/emergencyanalysis_event.conf -%{_datadir}/%{name}/events/report_EmergencyAnalysis.xml #plugin-kerneloops %{_datadir}/%{name}/events/report_Kerneloops.xml @@ -251,6 +226,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/libreport/plugins/bugzilla_format_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 # Public api headers: %doc apidoc/html/*.{html,png,css,js} @@ -272,12 +259,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/libreport/ureport.h %{_includedir}/libreport/reporters.h %{_includedir}/libreport/global_configuration.h -%{_includedir}/libreport/internal_abrt_dbus.h %{_includedir}/libreport/internal_libreport.h %{_includedir}/libreport/xml_parser.h %{_includedir}/libreport/helpers %{_libdir}/libreport.so -%{_libdir}/libabrt_dbus.so %{_libdir}/pkgconfig/libreport.pc %dir %{_includedir}/libreport #web-devel @@ -289,12 +274,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/libreport/internal_libreport_gtk.h %{_libdir}/pkgconfig/libreport-gtk.pc -%if %{with python2_libreport} -%files -n python2-libreport -%{python2_sitearch}/report/ -%{python2_sitearch}/reportclient/ -%endif - %files -n python3-libreport %{python3_sitearch}/report/ %{python3_sitearch}/reportclient/ @@ -303,7 +282,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man1/report-cli.1.gz %{_mandir}/man1/report-newt.1.gz %{_mandir}/man1/report-gtk.1.gz -%{_mandir}/man5/emergencyanalysis_event.conf.5.* %{_mandir}/man*/reporter-kerneloops.* %{_mandir}/man5/report_Logger.conf.5.* %{_mandir}/man5/print_event.conf.5.* @@ -346,6 +324,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_mandir}/man5/report_rhel.conf.5.* %changelog +* Sat Jan 09 2021 shixuantong - 2.13.1-3 +- Split filesystem package and add version limit for some provides symbol + +* Fri Aug 21 2020 shixuantong - 2.13.1-2 +- sovle nothing provides libreport-python3 problem + +* Tue Jul 28 2020 xinghe - 2.13.1-1 +- update version to 2.13.1 + * Mon Mar 30 2020 openEuler Buildteam - 2.10.1-8 - remove useless functions