From 336ca561dd98df7f3a9db19420f1a4734dacc407 Mon Sep 17 00:00:00 2001 From: Jakub Filak Date: Sep 13 2013 13:55:44 +0000 Subject: remove rhel GPG keys patch which is no more necessary https://github.com/abrt/abrt/issues/686 --- diff --git a/abrt-rhelkeys.patch b/abrt-rhelkeys.patch deleted file mode 100644 index 4db0ea9..0000000 --- a/abrt-rhelkeys.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- abrt-2.0.3/src/daemon/gpg_keys 2011-06-08 17:00:18.000000000 +0200 -+++ abrt-2.0.3_/src/daemon/gpg_keys 2011-07-14 20:57:09.000000000 +0200 -@@ -1 +1,5 @@ --/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora -+/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-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 diff --git a/abrt.spec b/abrt.spec index 62edac0..1d7bd26 100644 --- a/abrt.spec +++ b/abrt.spec @@ -38,7 +38,6 @@ Group: Applications/System URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz # don't remove this patch, packages in rawhide are not signed! -Patch0: abrt-rhelkeys.patch Patch1: disable_gpg_check.patch 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 @@ -342,7 +341,6 @@ to the shell %setup -q #RHEL %if 0%{?rhel} >= 7 -%patch0 -p1 -b .rhel_gpg %patch2 -p1 -b .ureport %patch3 -p1 -b .shoretened %patch4 -p1 -b .autoreporting