Jakub Filak
parent
cb53a4ad19
commit
826fd374c3
1
.gitignore
vendored
1
.gitignore
vendored
@ -31,3 +31,4 @@ abrt-1.1.13.tar.gz
|
||||
/abrt-2.1.7.tar.gz
|
||||
/abrt-2.1.8.tar.gz
|
||||
/abrt-2.1.9.tar.gz
|
||||
/abrt-2.1.10.tar.gz
|
||||
|
||||
31
abrt-2.1.10-gtk3_deprecated_API.patch
Normal file
31
abrt-2.1.10-gtk3_deprecated_API.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 8004afb7100e94efbca60ad4a08e599d7c2112f4 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Filak <jfilak@redhat.com>
|
||||
Date: Wed, 11 Dec 2013 17:04:52 +0100
|
||||
Subject: [ABRT PATCH] configui: do not use deprecated gtk3 API
|
||||
|
||||
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
||||
---
|
||||
src/configuration-gui/system-config-abrt.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/configuration-gui/system-config-abrt.c b/src/configuration-gui/system-config-abrt.c
|
||||
index d5afb43..4638dd6 100644
|
||||
--- a/src/configuration-gui/system-config-abrt.c
|
||||
+++ b/src/configuration-gui/system-config-abrt.c
|
||||
@@ -45,8 +45,13 @@ GtkWidget *system_config_abrt_widget_new(void)
|
||||
GtkWidget *buttons = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, /*spacing*/0);
|
||||
gtk_box_pack_start(GTK_BOX(box), buttons, /*expand*/TRUE, /*fill*/FALSE, /*padding*/0);
|
||||
|
||||
+#if ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION < 11) || (GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION == 11 && GTK_MICRO_VERSION < 2))
|
||||
gtk_widget_set_margin_left(buttons, 10);
|
||||
gtk_widget_set_margin_right(buttons, 10);
|
||||
+#else
|
||||
+ gtk_widget_set_margin_start(buttons, 10);
|
||||
+ gtk_widget_set_margin_end(buttons, 10);
|
||||
+#endif
|
||||
gtk_widget_set_margin_top(buttons, 10);
|
||||
gtk_widget_set_margin_bottom(buttons, 10);
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
95
abrt.spec
95
abrt.spec
@ -34,11 +34,11 @@
|
||||
%define docdirversion -%{version}
|
||||
%endif
|
||||
|
||||
%define libreport_ver 2.1.9
|
||||
%define libreport_ver 2.1.10
|
||||
|
||||
Summary: Automatic bug detection and reporting tool
|
||||
Name: abrt
|
||||
Version: 2.1.9
|
||||
Version: 2.1.10
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: Applications/System
|
||||
@ -50,6 +50,9 @@ Patch2: abrt-2.1.6.rhel-remove_all_ureport_lines_from_config.patch
|
||||
Patch3: abrt-2.1.6.rhel-dont_enable_shortened_reporting_in_gnome.patch
|
||||
Patch4: abrt-2.1.1-disable_autoreporting_dialog.patch
|
||||
|
||||
# remove with abrt > 2.1.10
|
||||
Patch5: abrt-2.1.10-gtk3_deprecated_API.patch
|
||||
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: rpm-devel >= 4.6
|
||||
@ -66,11 +69,12 @@ BuildRequires: asciidoc
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: libreport-devel >= %{libreport_ver}
|
||||
BuildRequires: satyr-devel >= 0.11
|
||||
BuildRequires: satyr-devel >= 0.12
|
||||
BuildRequires: systemd-python
|
||||
BuildRequires: augeas
|
||||
|
||||
Requires: libreport >= %{libreport_ver}
|
||||
Requires: satyr >= 0.11
|
||||
Requires: satyr >= 0.12
|
||||
|
||||
%if %{with systemd}
|
||||
Requires: systemd-units
|
||||
@ -78,6 +82,8 @@ Requires: systemd-units
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires(pre): shadow-utils
|
||||
Requires: python-dbus
|
||||
Requires: libreport-plugin-ureport
|
||||
|
||||
%description
|
||||
%{name} is a tool to help users to detect defects in applications and
|
||||
@ -236,6 +242,8 @@ Summary: %{name}'s addon for catching and analyzing Python exceptions
|
||||
Group: System Environment/Libraries
|
||||
Requires: python
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: systemd-python
|
||||
Requires: abrt-python
|
||||
|
||||
%description addon-python
|
||||
This package contains python hook and python analyzer plugin for handling
|
||||
@ -371,6 +379,7 @@ to the shell
|
||||
%endif
|
||||
#Fedora
|
||||
%patch1 -p1 -b .gpgcheck
|
||||
%patch5 -p1 -b .gtk3
|
||||
|
||||
%build
|
||||
autoconf
|
||||
@ -527,6 +536,11 @@ service abrt-xorg condrestart >/dev/null 2>&1 || :
|
||||
|
||||
%posttrans addon-vmcore
|
||||
service abrt-vmcore condrestart >/dev/null 2>&1 || :
|
||||
# Copy the configuration file to plugin's directory
|
||||
test -f /etc/abrt/abrt-harvest-vmcore.conf && {
|
||||
mv -b /etc/abrt/abrt-harvest-vmcore.conf /etc/abrt/plugins/vmcore.conf
|
||||
}
|
||||
exit 0
|
||||
|
||||
%posttrans addon-pstoreoops
|
||||
service abrt-pstoreoops condrestart >/dev/null 2>&1 || :
|
||||
@ -551,16 +565,25 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_libexecdir}/abrt-handle-event
|
||||
%{_libexecdir}/abrt-action-ureport
|
||||
%{_bindir}/abrt-handle-upload
|
||||
%{_bindir}/abrt-action-notify
|
||||
%{_mandir}/man1/abrt-action-notify.1.gz
|
||||
%{_bindir}/abrt-action-save-package-data
|
||||
%{_bindir}/abrt-watch-log
|
||||
%{_bindir}/abrt-action-analyze-xorg
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/abrt.conf
|
||||
%{_datadir}/%{name}/conf.d/abrt.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/abrt-action-save-package-data.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/xorg.conf
|
||||
%{_datadir}/%{name}/conf.d/abrt-action-save-package-data.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/plugins/xorg.conf
|
||||
%{_datadir}/%{name}/conf.d/plugins/xorg.conf
|
||||
%{_mandir}/man5/abrt-xorg.conf.5.gz
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/gpg_keys.conf
|
||||
%{_datadir}/%{name}/conf.d/gpg_keys.conf
|
||||
%{_mandir}/man5/gpg_keys.conf.5.gz
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/abrt_event.conf
|
||||
%{_mandir}/man5/abrt_event.conf.5.gz
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/smart_event.conf
|
||||
%{_mandir}/man5/smart_event.conf.5.gz
|
||||
%dir %attr(0755, abrt, abrt) %{_localstatedir}/tmp/%{name}
|
||||
%dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload
|
||||
# abrtd runs as root
|
||||
@ -570,6 +593,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
%dir %{_sysconfdir}/%{name}/plugins
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_datadir}/%{name}/conf.d
|
||||
%dir %{_datadir}/%{name}/conf.d/plugins
|
||||
%{_mandir}/man1/abrt-handle-upload.1.gz
|
||||
%{_mandir}/man1/abrt-server.1.gz
|
||||
%{_mandir}/man1/abrt-action-save-package-data.1.gz
|
||||
@ -579,6 +605,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_mandir}/man5/abrt.conf.5.gz
|
||||
%{_mandir}/man5/abrt-action-save-package-data.conf.5.gz
|
||||
# {_mandir}/man5/pyhook.conf.5.gz
|
||||
# filesystem package should own /usr/share/augeas/lenses directory
|
||||
%{_datadir}/augeas/lenses/abrt.aug
|
||||
|
||||
|
||||
%files libs
|
||||
%defattr(-,root,root,-)
|
||||
@ -586,7 +615,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc apidoc/html/*
|
||||
# The complex pattern below (instead of simlpy *) excludes Makefile{.am,.in}:
|
||||
%doc apidoc/html/*.{html,png,css,js}
|
||||
%{_includedir}/abrt/abrt-dbus.h
|
||||
%{_includedir}/abrt/hooklib.h
|
||||
%{_includedir}/abrt/libabrt.h
|
||||
@ -624,6 +654,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%files addon-ccpp
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/plugins/CCpp.conf
|
||||
%{_datadir}/%{name}/conf.d/plugins/CCpp.conf
|
||||
%{_mandir}/man5/abrt-CCpp.conf.5.gz
|
||||
%dir %attr(0775, abrt, abrt) %{_localstatedir}/cache/abrt-di
|
||||
%if %{with systemd}
|
||||
%{_unitdir}/abrt-ccpp.service
|
||||
@ -646,9 +678,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_bindir}/abrt-action-analyze-ccpp-local
|
||||
%{_sbindir}/abrt-install-ccpp-hook
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_event.conf
|
||||
%{_mandir}/man5/ccpp_event.conf.5.gz
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/gconf_event.conf
|
||||
%{_mandir}/man5/gconf_event.conf.5.gz
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/vimrc_event.conf
|
||||
%{_datadir}/libreport/events/analyze_CCpp.xml
|
||||
%{_mandir}/man5/vimrc_event.conf.5.gz
|
||||
%{_datadir}/libreport/events/analyze_LocalGDB.xml
|
||||
%{_datadir}/libreport/events/collect_xsession_errors.xml
|
||||
%{_datadir}/libreport/events/collect_GConf.xml
|
||||
@ -682,11 +717,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_bindir}/abrt-retrace-client
|
||||
%{_mandir}/man1/abrt-retrace-client.1.gz
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/ccpp_retrace_event.conf
|
||||
%{_mandir}/man5/ccpp_retrace_event.conf.5.gz
|
||||
%{_datadir}/libreport/events/analyze_RetraceServer.xml
|
||||
|
||||
%files addon-kerneloops
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/koops_event.conf
|
||||
%{_mandir}/man5/koops_event.conf.5.gz
|
||||
%if %{with systemd}
|
||||
%{_unitdir}/abrt-oops.service
|
||||
%else
|
||||
@ -702,6 +739,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%files addon-xorg
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/xorg_event.conf
|
||||
%{_mandir}/man5/xorg_event.conf.5.gz
|
||||
%if %{with systemd}
|
||||
%{_unitdir}/abrt-xorg.service
|
||||
%else
|
||||
@ -713,7 +751,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%files addon-vmcore
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/vmcore_event.conf
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/abrt-harvest-vmcore.conf
|
||||
%{_mandir}/man5/vmcore_event.conf.5.gz
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/plugins/vmcore.conf
|
||||
%{_datadir}/%{name}/conf.d/plugins/vmcore.conf
|
||||
%{_datadir}/libreport/events/analyze_VMcore.xml
|
||||
%if %{with systemd}
|
||||
%{_unitdir}/abrt-vmcore.service
|
||||
@ -723,6 +763,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_sbindir}/abrt-harvest-vmcore
|
||||
%{_bindir}/abrt-action-analyze-vmcore
|
||||
%{_mandir}/man1/abrt-harvest-vmcore.1*
|
||||
%{_mandir}/man5/abrt-vmcore.conf.5*
|
||||
%{_mandir}/man1/abrt-action-analyze-vmcore.1*
|
||||
|
||||
%files addon-pstoreoops
|
||||
@ -740,8 +781,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%files addon-python
|
||||
%defattr(-,root,root,-)
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/plugins/python.conf
|
||||
%{_datadir}/%{name}/conf.d/plugins/python.conf
|
||||
%{_mandir}/man5/abrt-python.conf.5.gz
|
||||
# TODO? Do we need %config(noreplace) in the below line too?
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/python_event.conf
|
||||
%{_mandir}/man5/python_event.conf.5.gz
|
||||
%{_bindir}/abrt-action-analyze-python
|
||||
%{_mandir}/man1/abrt-action-analyze-python.1*
|
||||
%{python_sitearch}/abrt*.py*
|
||||
@ -771,7 +815,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Problems.xml
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.problems.service
|
||||
%{_datadir}/polkit-1/actions/abrt_polkit.policy
|
||||
%config(noreplace) %{_sysconfdir}/libreport/events.d/dbus_event.conf
|
||||
%dir %{_defaultdocdir}/%{name}-dbus%{docdirversion}/
|
||||
%dir %{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/
|
||||
%{_defaultdocdir}/%{name}-dbus%{docdirversion}/html/*.html
|
||||
@ -788,6 +831,42 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
%config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh
|
||||
|
||||
%changelog
|
||||
* Wed Dec 11 2013 Jakub Filak <jfilak@redhat.com> 2.1.10-1
|
||||
- abrt-cli: display URL to reports in the details
|
||||
- abrt-cli list: list all problems by default
|
||||
- Do not copy Makefiles to documentation.
|
||||
- harvest_vmcore: Fix absolute path handling
|
||||
- Speed up journalctl --system support detection
|
||||
- spec: add abrt's augeas module
|
||||
- add augeas module for abrt configuration files
|
||||
- spec: rename CCpp.conf
|
||||
- rename CCpp.conf man to abrt-CCpp.conf
|
||||
- spec: move vmcore addon's configuration to a new dir
|
||||
- vmcore: reorganize configuration
|
||||
- make: install abrt-harvest-vmcore into share conf.d
|
||||
- spec: install abrt-harvest-vmcore.conf to share conf.d
|
||||
- switch to libreport workflows in all report-cli events
|
||||
- abrtd: use warning level for "Recreating deleted ..." message
|
||||
- abrt-python: add missing arguments to Crash handler
|
||||
- spec: adapt recent changes related to abrt-action-notify
|
||||
- move the notify event from dbus_event.conf to abrt_event.conf
|
||||
- run the autoreporting event from abrt-action-notify
|
||||
- spec: install conf to /usr/share/abrt/conf.d
|
||||
- Load conf from /usr/share/abrt/conf.d and /etc/abrt
|
||||
- abrt-action-install-debuginfo: fix --exact handling. Fixes rhbz1027786
|
||||
- Use bugzilla_formatdup.conf for detected duplicates in python too. Fixes rhbz#875312.
|
||||
- applet: properly handle incomplete problems
|
||||
- DBus Problems API: update documentation
|
||||
- spec: add abrt-action-notify
|
||||
- factor out the D-Bus notifications into a python script
|
||||
- adapt post_create event to the recent changes in reporter-ureport
|
||||
- spec: add Requires: systemd-python for python addon
|
||||
- shorten CCpp reason message
|
||||
- abrt-dump-oops: if backtrace is not seen, file an one-line oops. Fixes rhbz#812537
|
||||
- Update translations
|
||||
- Add several manpages
|
||||
- Resolves: #812204, #1005762
|
||||
|
||||
* Sat Oct 26 2013 Jakub Filak <jfilak@redhat.com> 2.1.9-1
|
||||
- pyhook: add logging workaround for rhbz#1023041
|
||||
- spec: add systemd-python to BuildRequires
|
||||
|
||||
Loading…
Reference in New Issue
Block a user