minor rhel7 build fixes

This commit is contained in:
Jiri 2012-04-18 12:46:04 +02:00
parent da0e1f2b09
commit 3872b9422d
2 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,5 @@
--- 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-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 +++ abrt-2.0.3_/src/daemon/gpg_keys 2011-07-14 20:57:09.000000000 +0200
@@ -1 +1,5 @@ @@ -1 +1,5 @@
-/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora -/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-beta

View File

@ -25,7 +25,7 @@
Summary: Automatic bug detection and reporting tool Summary: Automatic bug detection and reporting tool
Name: abrt Name: abrt
Version: 2.0.10 Version: 2.0.10
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: https://fedorahosted.org/abrt/ URL: https://fedorahosted.org/abrt/
@ -231,7 +231,7 @@ uses PolicyKit to authorize to access the problem data.
%setup -q %setup -q
#RHEL #RHEL
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
%patch0 -p1 -b .rhel_gpg %patch0 -p1 -b .rhel_gpg
%endif %endif
#Fedora #Fedora
%patch1 -p1 -b .blacklist %patch1 -p1 -b .blacklist
@ -639,6 +639,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/polkit-1/actions/abrt_polkit.policy %{_datadir}/polkit-1/actions/abrt_polkit.policy
%changelog %changelog
* Wed Apr 18 2012 Jiri Moskovcak <jmoskovc@redhat.com> 2.0.10-2
- minor rhel7 build fixes
* Mon Apr 02 2012 Jiri Moskovcak <jmoskovc@redhat.com> 2.0.10-1 * Mon Apr 02 2012 Jiri Moskovcak <jmoskovc@redhat.com> 2.0.10-1
- new upstream release - new upstream release
- fixed problem with empty problem directory rhzb#808131 - fixed problem with empty problem directory rhzb#808131