summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Klic <kklic@redhat.com>2010-02-08 14:16:18 +0100
committerKarel Klic <kklic@redhat.com>2010-02-08 14:16:18 +0100
commitad1c37d1b863277d82e6b4b866171a8464dec33c (patch)
tree4e58969befb6fe2bc461ec70dac1305bb54a35f5
parent3406715e343774dfc0329c81f35fcfdd4e23ff10 (diff)
downloadabrt-ad1c37d1b863277d82e6b4b866171a8464dec33c.tar.gz
abrt-ad1c37d1b863277d82e6b4b866171a8464dec33c.tar.xz
abrt-ad1c37d1b863277d82e6b4b866171a8464dec33c.zip
Put back changes accidentally pushed from RHEL6 branch to master by me
-rw-r--r--abrt.spec4
-rw-r--r--src/Daemon/abrt.conf15
-rw-r--r--src/Daemon/gpg_keys9
3 files changed, 11 insertions, 17 deletions
diff --git a/abrt.spec b/abrt.spec
index 0207c01d..2ee70348 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -205,7 +205,7 @@ 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-ticketuploader, %{name}-plugin-sosreport
+Requires: %{name}-plugin-logger, %{name}-plugin-bugzilla, %{name}-plugin-runapp
#Requires: %{name}-plugin-firefox
Obsoletes: bug-buddy
Provides: bug-buddy
@@ -227,6 +227,8 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
%find_lang %{name}
+#rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.la
+#rm -rf $RPM_BUILD_ROOT/%{_libdir}/%{name}/lib*.la
# remove all .la and .a files
find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir}
diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf
index 8ed5179c..32ba2111 100644
--- a/src/Daemon/abrt.conf
+++ b/src/Daemon/abrt.conf
@@ -12,17 +12,15 @@ 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"), 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
+#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 .")
# What actions or reporters to run on each crash type
[ AnalyzerActionsAndReporters ]
-Kerneloops = TicketUploader, Bugzilla
-CCpp = TicketUploader, Bugzilla
-Python = TicketUploader, Bugzilla
+Kerneloops = KerneloopsReporter
+CCpp = Bugzilla, Logger
+Python = Bugzilla, Logger
#CCpp:xorg-x11-apps = RunApp("date", "date.txt")
# Which Action plugins to run repeatedly
@@ -30,3 +28,4 @@ Python = TicketUploader, Bugzilla
# h:m - at h:m
# s - every s seconds
120 = KerneloopsScanner
+#02:00 = FileTransfer \ No newline at end of file
diff --git a/src/Daemon/gpg_keys b/src/Daemon/gpg_keys
index 2c59d0a1..cde50f13 100644
--- a/src/Daemon/gpg_keys
+++ b/src/Daemon/gpg_keys
@@ -1,8 +1 @@
-/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
-/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release-2
+/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora