diff --git a/SOURCES/0079-cli-mark-the-suggestion-text-for-translation.patch b/SOURCES/0079-cli-mark-the-suggestion-text-for-translation.patch index 0b54f56..29e48cb 100644 --- a/SOURCES/0079-cli-mark-the-suggestion-text-for-translation.patch +++ b/SOURCES/0079-cli-mark-the-suggestion-text-for-translation.patch @@ -1,7 +1,7 @@ From 187530c4df6971927d1e099584be5b418ab2725b Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Fri, 12 Dec 2014 14:19:49 +0100 -Subject: [ABRT PATCH 79/82] cli: mark the suggestion text for translation +Subject: [PATCH] cli: mark the suggestion text for translation Related: #1087880 diff --git a/SOURCES/event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch b/SOURCES/event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch deleted file mode 100644 index 334986f..0000000 --- a/SOURCES/event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6c95ae2bf1c80530442a516f23b7cd8e82dcae12 Mon Sep 17 00:00:00 2001 -From: Matej Habrnal -Date: Thu, 22 Jan 2015 02:23:21 +0100 -Subject: [PATCH 88/91] event: don't run the 'reporter-bugzilla -h' on RHEL and - CentOS - -Running the 'reporter-bugzilla -h' makes sense only on Fedora because of bodhi. - -Signed-off-by: Matej Habrnal ---- - src/plugins/ccpp_event.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/plugins/ccpp_event.conf b/src/plugins/ccpp_event.conf -index 62ff08a..cd75ee2 100644 ---- a/src/plugins/ccpp_event.conf -+++ b/src/plugins/ccpp_event.conf -@@ -71,7 +71,7 @@ EVENT=analyze_LocalGDB analyzer=CCpp - # Run GDB plugin to see if crash looks exploitable - abrt-action-analyze-vulnerability - # Run GDB to genereate backtrace -- abrt-action-analyze-ccpp-local --without-bodhi -+ abrt-action-analyze-ccpp-local --without-bz - - - # Bugzilla requires nonempty duphash --- -1.8.3.1 - diff --git a/SOURCES/plugin-set-URL-to-retrace-server.patch b/SOURCES/plugin-set-URL-to-retrace-server.patch deleted file mode 100644 index b2dc31a..0000000 --- a/SOURCES/plugin-set-URL-to-retrace-server.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 81181a893b91a229e05a5a915cc98347126e3834 Mon Sep 17 00:00:00 2001 -From: Matej Habrnal -Date: Fri, 30 Jan 2015 17:52:25 +0100 -Subject: [PATCH 90/91] plugin: set URL to retrace server - -Changed default retrace server URL from localhost to retrace.fedoraproject.org. - -Signed-off-by: Matej Habrnal ---- - src/plugins/analyze_CCpp.xml.in | 2 +- - src/plugins/analyze_RetraceServer.xml.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/analyze_CCpp.xml.in b/src/plugins/analyze_CCpp.xml.in -index 6f02692..a7ce4dd 100644 ---- a/src/plugins/analyze_CCpp.xml.in -+++ b/src/plugins/analyze_CCpp.xml.in -@@ -26,7 +26,7 @@ - - -diff --git a/src/plugins/analyze_RetraceServer.xml.in b/src/plugins/analyze_RetraceServer.xml.in -index cf1d25a..e437cac 100644 ---- a/src/plugins/analyze_RetraceServer.xml.in -+++ b/src/plugins/analyze_RetraceServer.xml.in -@@ -12,7 +12,7 @@ - - --- -1.8.3.1 - diff --git a/SOURCES/turn-sosreport-off.patch b/SOURCES/turn-sosreport-off.patch deleted file mode 100644 index e570138..0000000 --- a/SOURCES/turn-sosreport-off.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2b02dc85753e4b11f10bfa2d660aa493ae80c52b Mon Sep 17 00:00:00 2001 -From: Jakub Filak -Date: Thu, 20 Nov 2014 11:24:39 +0100 -Subject: [PATCH] turn sosreport off - ---- - src/daemon/abrt_event.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/daemon/abrt_event.conf b/src/daemon/abrt_event.conf -index 380b312..eafee17 100644 ---- a/src/daemon/abrt_event.conf -+++ b/src/daemon/abrt_event.conf -@@ -67,7 +67,7 @@ EVENT=post-create runlevel= - # Example: if you want to save sosreport immediately at the moment of a crash: - # (alternatively, you can add similar command to EVENT=analyze_foo's, - # if you would rather perform this collection later): --EVENT=post-create -+#EVENT=post-create - nice sosreport --tmp-dir "$DUMP_DIR" --batch \ - --only=anaconda --only=boot --only=devicemapper \ - --only=filesys --only=hardware --only=kernel --only=libraries \ --- -1.8.3.1 - diff --git a/SPECS/abrt.spec b/SPECS/abrt.spec index b266a2a..fd28e85 100644 --- a/SPECS/abrt.spec +++ b/SPECS/abrt.spec @@ -33,7 +33,7 @@ Summary: Automatic bug detection and reporting tool Name: abrt Version: 2.1.11 -Release: 35%{?dist} +Release: 36%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ @@ -54,6 +54,12 @@ Patch12: 0012-configui-show-Close-button-in-the-dialog.patch Patch13: 0013-applet-do-not-say-the-report-is-anonymous-when-urepo.patch #Patch14: 0014-spec-abrt-cli-requires-a-pkg-providing-workflows.patch #Patch15: 0015-testsuite-encourage-users-to-create-a-case-in-RHTS.patch + +# This patch is removed by patch +# 1005-cli-list-revert-patch-7966e5737e8d3af43b1ecdd6a82323.patch +# listed below. Without Patch16 is not possible to apply following patches +# without conflict +Patch16: 0016-cli-list-show-a-hint-about-creating-a-case-in-RHTS.patch Patch17: 0017-harvest-vmcore-properly-handle-inaccessible-dir-erro.patch Patch18: 0018-don-t-break-the-event-run-by-failures-of-abrt-action.patch Patch19: 0019-Fix-handling-of-Machine-Check-Exceptions.patch @@ -116,6 +122,9 @@ Patch75: 0075-Translation-updates.patch Patch76: 0076-Revert-gdb-disable-loading-of-auto-loaded-files.patch Patch77: 0077-gdb-make-gdb-aware-of-the-abrt-s-debuginfo-dir.patch #Patch78: 0078-spec-update-the-required-gdb-version.patch +# will be removed by +# 1005-cli-list-revert-patch-7966e5737e8d3af43b1ecdd6a82323.patch +Patch79: 0079-cli-mark-the-suggestion-text-for-translation.patch Patch80: 0080-auto-reporting-add-options-to-specify-auth-type.patch #Patch81: 0081-testsuite-abrt-auto-reporting-uReport-authentication.patch Patch82: 0082-translations-pull-the-newest-PO-files.patch @@ -237,13 +246,18 @@ Patch180: 0180-ccpp-ignore-crashes-of-ABRT-binaries-if-DebugLevel-0.patch Patch181: 0181-ccpp-save-abrt-core-files-only-to-new-files.patch Patch182: 0182-lib-add-convenient-wrappers-for-ensuring-writable-di.patch Patch183: 0183-abrtd-switch-owner-of-the-dump-location-to-root.patch -Patch184: event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch -Patch185: plugin-set-URL-to-retrace-server.patch -Patch186: turn-sosreport-off.patch #Patch184: 0184-spec-switch-owner-of-the-dump-location-to-root.patch #Patch185: 0185-testsuite-ccpp-plugin-debug.patch #Patch186: 0186-testsuite-a-a-i-debuginfo-the-set-uid-wrapper-uses-s.patch #Patch187: 0187-testsuite-check-file-system-attributes-of-the-dump-l.patch + +Patch1000: 1000-event-don-t-run-the-reporter-bugzilla-h-on-RHEL-and-.patch +#Patch1001: 1001-spec-added-dependency-to-libreport-centos.patch +Patch1002: 1002-plugin-set-URL-to-retrace-server.patch +#Patch1003: 1003-spec-add-dependenci-on-abrt-retrace-client.patch +Patch1004: 1004-turn-sosreport-off.patch +Patch1005: 1005-cli-list-revert-patch-7966e5737e8d3af43b1ecdd6a82323.patch +#Patch1006: 1006-spec-disable-authenticated-autoreporting.patch # git format-patch 2.1.11-35.el7 -N --start-number 188 --topo-order @@ -597,8 +611,7 @@ CFLAGS="%{optflags} -Werror" %configure --enable-doxygen-docs --disable-silent-r --enable-native-unwinder \ %endif --enable-dump-time-unwind \ - --enable-suggest-autoreporting \ - --enable-authenticated-autoreporting + --enable-suggest-autoreporting make %{?_smp_mflags} %install @@ -1074,6 +1087,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %config(noreplace) %{_sysconfdir}/profile.d/abrt-console-notification.sh %changelog +* Mon Nov 30 2015 Matej Habrnal - 2.1.11-36.el7.centos +- add abrt patches related to CentOS from https://github.com/abrt/abrt/tree/centos7 +- disabled authenticated autoreporting + * Mon Nov 23 2015 CentOS Sources - 2.1.11-35.el7.centos - Drop RHTS hint - Change by David Mansfield