diff --git a/.gitignore b/.gitignore index fd245ec..ab83d5f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ abrt-1.1.13.tar.gz /abrt-1.1.14.tar.gz /abrt-1.1.17.tar.gz /abrt-2.0.0.tar.gz +/abrt-2.0.1.tar.gz diff --git a/abrt-1.0.9-hideprefs.patch b/abrt-1.0.9-hideprefs.patch deleted file mode 100644 index 668f092..0000000 --- a/abrt-1.0.9-hideprefs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- abrt-1.0.9/src/Gui/ccgui.glade 2010-03-31 10:34:14.000000000 +0200 -+++ abrt-1.0.9_hideprefs/src/Gui/ccgui.glade 2010-03-31 21:39:27.653364662 +0200 -@@ -102,7 +102,7 @@ - - - gtk-preferences -- True -+ False - True - True - True diff --git a/abrt.spec b/abrt.spec index 219b37b..d4a3afc 100644 --- a/abrt.spec +++ b/abrt.spec @@ -21,7 +21,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt -Version: 2.0.0 +Version: 2.0.1 Release: %{?pkg_release} License: GPLv2+ Group: Applications/System @@ -30,7 +30,8 @@ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz Source1: abrt.init Source2: abrt-ccpp.init Patch0: remove_libreport_python.patch -Patch1: settings_warning.patch +Patch1: blacklist.patch +Patch2: allow_bz_for_koops.patch BuildRequires: dbus-devel BuildRequires: gtk2-devel BuildRequires: curl-devel @@ -253,7 +254,7 @@ Group: System Environment/Daemons Requires: abrt-addon-ccpp Requires: gdb >= 7.0-3 Requires: httpd, mod_wsgi, mod_ssl, python-webob -Requires: mock, xz, elfutils, createrepo +Requires: mock, xz, elfutils, createrepo, rsync %{?el6:Requires: python-argparse} Requires(preun): /sbin/install-info Requires(post): /sbin/install-info @@ -265,8 +266,8 @@ generation service over a network using HTTP protocol. %prep %setup -q %patch0 -p1 -b .libreport_py -# FIXME remove when settings check is implemented -%patch1 -p1 -b .warning +%patch1 -p1 -b .blacklist +%patch2 -p1 -b bz_for_oops %build autoconf @@ -289,6 +290,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_initrddir}/abrt-ccpp mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di mkdir -p $RPM_BUILD_ROOT/var/run/abrt mkdir -p $RPM_BUILD_ROOT/var/spool/abrt +mkdir -p $RPM_BUILD_ROOT/var/spool/abrt-retrace +mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-retrace +mkdir -p $RPM_BUILD_ROOT/var/log/abrt-retrace mkdir -p $RPM_BUILD_ROOT/var/spool/abrt-upload desktop-file-install \ @@ -334,6 +338,7 @@ fi %post retrace-server /sbin/install-info %{_infodir}/abrt-retrace-server %{_infodir}/dir 2> /dev/null || : +/usr/sbin/usermod -G mock apache 2> /dev/null || : %preun if [ "$1" -eq "0" ] ; then @@ -433,6 +438,7 @@ fi %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/plugins %dir %{_sysconfdir}/%{name}/events.d +%dir %{_sysconfdir}/%{name}/events #%dir %{_libdir}/%{name} %{_mandir}/man8/abrtd.8.gz %{_mandir}/man5/%{name}.conf.5.gz @@ -467,9 +473,10 @@ fi %defattr(-,root,root,-) %{_includedir}/abrt/* %{_libdir}/libabrt*.so +%{_includedir}/btparser/* %{_libdir}/libbtparser.so #FIXME: this should go to libreportgtk-devel package -%{_libdir}/libreportgtk.so* +%{_libdir}/libreportgtk.so %{_libdir}/pkgconfig/* %doc doc/abrt-plugin doc/howto-write-reporter @@ -509,7 +516,7 @@ fi %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Kerneloops.conf %{_sysconfdir}/%{name}/events/report_Kerneloops.xml -%{_sysconfdir}/%{name}/events.d/koops_events.conf +%config(noreplace) %{_sysconfdir}/%{name}/events.d/koops_events.conf %{_mandir}/man7/abrt-KerneloopsReporter.7.gz %{_bindir}/abrt-dump-oops %{_bindir}/abrt-action-analyze-oops @@ -524,7 +531,7 @@ fi %files plugin-mailx %defattr(-,root,root,-) %{_sysconfdir}/%{name}/events/report_Mailx.xml -%{_sysconfdir}/%{name}/events.d/mailx_events.conf +%config(noreplace) %{_sysconfdir}/%{name}/events.d/mailx_events.conf %{_mandir}/man7/abrt-Mailx.7.gz %{_bindir}/abrt-action-mailx @@ -540,6 +547,7 @@ fi %files plugin-rhtsupport %defattr(-,root,root,-) %{_sysconfdir}/%{name}/events/report_RHTSupport.xml +%config(noreplace) %{_sysconfdir}/%{name}/events.d/rhtsupport_events.conf # {_mandir}/man7/abrt-RHTSupport.7.gz %{_bindir}/abrt-action-rhtsupport @@ -553,7 +561,7 @@ fi %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/%{name}/plugins/Python.conf %{_bindir}/abrt-action-analyze-python -%{python_site}/*.py* +%{python_site}/abrt*.py* %{python_site}/abrt.pth %files cli @@ -570,14 +578,33 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/retrace.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/retrace_httpd.conf %config(noreplace) %{_sysconfdir}/yum.repos.d/retrace.repo -%{_bindir}/abrt-retrace-worker +%dir %attr(0775, apache, abrt) %{_localstatedir}/spool/abrt-retrace +%dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/abrt-retrace +%dir %attr(0755, abrt, abrt) %{_localstatedir}/log/abrt-retrace +%caps(cap_setuid=ep) %{_bindir}/abrt-retrace-worker +%{_bindir}/abrt-retrace-cleanup +%{_bindir}/abrt-retrace-reposync +%{_bindir}/coredump2packages +%{python_site}/retrace.py* %{_datadir}/abrt-retrace/*.py* +%{_datadir}/abrt-retrace/plugins/*.py* %{_datadir}/abrt-retrace/*.wsgi %{_infodir}/abrt-retrace-server* %changelog -* Tue Mar 29 2011 Jiri Moskovcak 2.0.0-2 -- use %ghost on files in /var/run and /var/lock rhbz#656542 +* Wed Apr 20 2011 Jiri Moskovcak 2.0.1-1 +- updated to 2.0.1 +- updated translation +- allowed reporting oops to bugzilla +- added warning when the plugin settings are wrong +- added help text in plugins settings +- the plugin settings dialog is translatable +- improved dir rescanning logic in abrt-gui +- fixed icons for child dialogs +- retrace-client: human readable messages instead of http codes +- save envirnment variables when app crashes +- fixed gpg/pgp check +- revert to the old icon * Wed Mar 16 2011 Jiri Moskovcak 2.0.0-1 - update to the latest upstream version diff --git a/allow_bz_for_koops.patch b/allow_bz_for_koops.patch new file mode 100644 index 0000000..711cfe9 --- /dev/null +++ b/allow_bz_for_koops.patch @@ -0,0 +1,7 @@ +--- abrt-2.0.1/src/plugins/koops_events.conf 2011-03-30 21:10:14.000000000 +0200 ++++ abrt-2.0.1_/src/plugins/koops_events.conf 2011-04-20 14:43:46.460859863 +0200 +@@ -9,3 +9,4 @@ + + # report + EVENT=report_Kerneloops analyzer=Kerneloops abrt-action-kerneloops ++EVENT=report_Bugzilla analyzer=Kerneloops abrt-action-bugzilla diff --git a/settings_warning.patch b/settings_warning.patch deleted file mode 100644 index f146ef7..0000000 --- a/settings_warning.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c -index 31c7bb2..e08dc4e 100644 ---- a/src/gui-wizard-gtk/wizard.c -+++ b/src/gui-wizard-gtk/wizard.c -@@ -1268,6 +1268,17 @@ static void add_pages(void) - config_btn = GTK_WIDGET(gtk_builder_get_object(builder, "button_cfg2")); - if (config_btn) - g_signal_connect(G_OBJECT(config_btn), "clicked", G_CALLBACK(on_show_event_list_cb), NULL); -+ -+ //hack to warn user about settings - will be removed before F15 GOLD -+ GtkWidget *settings_warning_eb = gtk_event_box_new(); -+ GtkWidget *settings_warning_lbl = gtk_label_new(_("Please make sure you configured the reporters.")); -+ gtk_container_add(GTK_CONTAINER(settings_warning_eb), settings_warning_lbl); -+ gtk_box_pack_start(GTK_BOX(pages[PAGENO_REPORTER_SELECTOR].page_widget), settings_warning_eb, false, false, 0); -+ GdkColor bg_color; -+ gdk_color_parse("red", &bg_color); -+ gtk_widget_modify_bg(settings_warning_eb, GTK_STATE_NORMAL, &bg_color); -+ gtk_widget_show_all(settings_warning_eb); -+ - } - - void create_assistant() diff --git a/sources b/sources index cfd6877..1f0bee7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4b486d64d0d908f56785e51be756ebc abrt-2.0.0.tar.gz +ead5853a19b070f548a887755fb015f1 abrt-2.0.1.tar.gz