diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | abrt.spec | 10 | ||||
| -rw-r--r-- | lib/Plugins/CCpp.conf | 2 | ||||
| -rw-r--r-- | lib/Plugins/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/Plugins/TicketUploader.conf | 2 | ||||
| -rw-r--r-- | src/Daemon/abrt.conf | 16 | ||||
| -rw-r--r-- | src/Daemon/gpg_keys | 8 | ||||
| -rw-r--r-- | src/Gui/ccgui.glade | 1 |
8 files changed, 30 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index ef369e63..3ef21e92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,6 +8,7 @@ rpm: dist --define "_specdir `pwd`" \ --define "_builddir `pwd`" \ --define "_srcrpmdir `pwd`" \ + --define "dist .el6" \ -ba abrt.spec srpm: dist @@ -183,9 +183,13 @@ uncaught exception in python programs. Summary: %{name}'s command line interface Group: User Interface/Desktops Requires: %{name} = %{version}-%{release} +# analyzers Requires: %{name}-addon-kerneloops Requires: %{name}-addon-ccpp, %{name}-addon-python -Requires: %{name}-plugin-bugzilla, %{name}-plugin-logger, %{name}-plugin-runapp +# reporters +Requires: %{name}-plugin-logger, %{name}-plugin-ticketuploader, %{name}-plugin-sosreport +# remove for GA +Requires: %{name}-plugin-bugzilla %description cli This package contains simple command line client for controlling abrt daemon over @@ -205,7 +209,9 @@ Requires: %{name}-addon-ccpp, %{name}-addon-python # Default config of addon-ccpp requires gdb Requires: gdb >= 7.0-3 Requires: %{name}-gui -Requires: %{name}-plugin-logger, %{name}-plugin-bugzilla, %{name}-plugin-runapp +Requires: %{name}-plugin-logger, %{name}-plugin-ticketuploader, %{name}-plugin-sosreport +# remove for GA +Requires: %{name}-plugin-bugzilla #Requires: %{name}-plugin-firefox Obsoletes: bug-buddy Provides: bug-buddy diff --git a/lib/Plugins/CCpp.conf b/lib/Plugins/CCpp.conf index 30e1550c..c8f54849 100644 --- a/lib/Plugins/CCpp.conf +++ b/lib/Plugins/CCpp.conf @@ -19,7 +19,7 @@ DebugInfo = install # If this option is set to "yes", # debuginfos will be installed to @@LOCALSTATEDIR@@/cache/abrt-di -InstallDebugInfo = yes +InstallDebugInfo = no # Additional directories to search for debuginfos. # For example, you can list a network-mounted shared store diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am index 4fc0efe5..e84c264b 100644 --- a/lib/Plugins/Makefile.am +++ b/lib/Plugins/Makefile.am @@ -58,8 +58,8 @@ libCCpp_la_LDFLAGS = -avoid-version libCCpp_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils \ -DCCPP_HOOK_PATH=\"${libexecdir}/abrt-hook-ccpp\" \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ - -DLOCALSTATEDIR='"$(localstatedir)"' -# -DHOSTILE_KERNEL + -DLOCALSTATEDIR='"$(localstatedir)"' \ + -DHOSTILE_KERNEL # Firefox - disabled for now diff --git a/lib/Plugins/TicketUploader.conf b/lib/Plugins/TicketUploader.conf index d851a167..23426feb 100644 --- a/lib/Plugins/TicketUploader.conf +++ b/lib/Plugins/TicketUploader.conf @@ -1,3 +1,5 @@ +# Enable/disable this plugin +Enabled = yes # Customer = "Example Inc." # Ticket = IT12345 # Encrypt = yes diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf index 32ba2111..00e18bec 100644 --- a/src/Daemon/abrt.conf +++ b/src/Daemon/abrt.conf @@ -12,15 +12,17 @@ Database = SQLite3 MaxCrashReportsSize = 1000 # Vector of actions and reporters which are activated immediately # after a crash occurs, comma separated. -#ActionsAndReporters = Mailx("[abrt] new crash was detected") -#ActionsAndReporters = FileTransfer("store") -ActionsAndReporters = RunApp("test x\"`cat component`\" = x\"xorg-x11-server-Xorg\" && cp /var/log/Xorg.0.log .") +#ActionsAndReporters = Mailx("[abrt] new crash was detected"), RunApp("cp /etc/mtab .") +# If you don't want sosreport to be run immediately after crash, +# you may comment it out here and add ", SOSreport" to "CCpp =" +# and "Python =" lines below. +ActionsAndReporters = SOSreport # What actions or reporters to run on each crash type [ AnalyzerActionsAndReporters ] -Kerneloops = KerneloopsReporter -CCpp = Bugzilla, Logger -Python = Bugzilla, Logger +Kerneloops = TicketUploader, Bugzilla +CCpp = TicketUploader, Bugzilla +Python = TicketUploader, Bugzilla #CCpp:xorg-x11-apps = RunApp("date", "date.txt") # Which Action plugins to run repeatedly @@ -28,4 +30,4 @@ Python = Bugzilla, Logger # h:m - at h:m # s - every s seconds 120 = KerneloopsScanner -#02:00 = FileTransfer
\ No newline at end of file +#02:00 = FileTransfer diff --git a/src/Daemon/gpg_keys b/src/Daemon/gpg_keys index cde50f13..99e17110 100644 --- a/src/Daemon/gpg_keys +++ b/src/Daemon/gpg_keys @@ -1 +1,7 @@ -/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora +/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta-2 +/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-auxiliary +/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta-2 +/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-beta +/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former +/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release +/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade index 652e6ff5..0b51334b 100644 --- a/src/Gui/ccgui.glade +++ b/src/Gui/ccgui.glade @@ -168,7 +168,6 @@ Patrick Connelly <pcon@fedoraproject.org></property> <child> <widget class="GtkImageMenuItem" id="miPreferences"> <property name="label">gtk-preferences</property> - <property name="visible">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="always_show_image">True</property> |