[abrt] fixed problems with rhel gpg keys rhbz#800419

Jiří Moskovčák jmoskovc at fedoraproject.org
Mon Mar 19 15:07:44 UTC 2012


commit 4e43e282e0482f2c6ea51f2e7ef8a3d69e33ea39
Author: Jiri <moskovcak at gmail.com>
Date:   Mon Mar 19 16:08:33 2012 +0100

    fixed problems with rhel gpg keys rhbz#800419

 abrt-rhelkeys.patch |    9 +++++++++
 abrt.spec           |   10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/abrt-rhelkeys.patch b/abrt-rhelkeys.patch
new file mode 100644
index 0000000..a19e427
--- /dev/null
+++ b/abrt-rhelkeys.patch
@@ -0,0 +1,9 @@
+--- abrt-2.0.3/src/daemon/gpg_keys	2011-06-08 17:00:18.000000000 +0200
++++ abrt-2.0.3/src/daemon/gpg_keys_6_2	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 bd73478..1fceace 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -26,7 +26,7 @@
 Summary: Automatic bug detection and reporting tool
 Name: abrt
 Version: 2.0.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/abrt/
@@ -41,7 +41,7 @@ Patch5: 0005-more-glib2.31-fixes.patch
 Patch6: 0006-missed-one-more-deprecated-g_io_channel_read.patch
 Patch7: 0007-abrt-action-install-debuginfo-do-not-use-scientific-.patch
 Patch8: 0008-abrt-cli-add-man-page.-Closes-rhbz-747624.patch
-
+Patch9: abrt-rhelkeys.patch
 BuildRequires: dbus-devel
 BuildRequires: gtk2-devel
 BuildRequires: rpm-devel >= 4.6
@@ -212,6 +212,9 @@ Virtual package to make easy default installation on desktop environments.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%if 0%{?rhel} >= 7
+    %patch9 -p1
+%endif
 
 %build
 autoconf
@@ -541,6 +544,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Mar 19 2012 Jiri Moskovcak <jmoskovc at redhat.com> 2.0.7-7
+- fixed problems with rhel gpg keys rhbz#800419
+
 * Thu Feb 02 2012 Jiri Moskovcak <jmoskovc at redhat.com> - 2.0.7-6
 - abrt-desktop shouldn't require bodhi on rhel (2nd try)
 


More information about the scm-commits mailing list