From 65631fa1bb2bcf4c8255c50f844950881756452b Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 5 Jan 2010 22:55:30 +0000 Subject: [PATCH] - use %%global instead of %%define - fix conditional for future RHEL --- krb5.spec | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/krb5.spec b/krb5.spec index 53de4ed..6c15e6d 100644 --- a/krb5.spec +++ b/krb5.spec @@ -1,16 +1,16 @@ -%define WITH_LDAP 1 -%define WITH_OPENSSL 1 -%define WITH_DIRSRV 1 +%global WITH_LDAP 1 +%global WITH_OPENSSL 1 +%global WITH_DIRSRV 1 -%define krb5prefix %{_prefix}/kerberos +%global krb5prefix %{_prefix}/kerberos # For consistency with regular login. -%define login_pam_service remote +%global login_pam_service remote Summary: The Kerberos network authentication system Name: krb5 Version: 1.7 -Release: 15%{?dist} +Release: 16%{?dist} # Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar Source0: krb5-%{version}.tar.gz @@ -87,7 +87,7 @@ URL: http://web.mit.edu/kerberos/www/ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf, bison, flex, gawk -%if 0%{?fedora} >= 12 +%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 BuildRequires: libcom_err-devel, libss-devel %endif BuildRequires: gzip, ncurses-devel, rsh, texinfo, texinfo-tex, tar @@ -217,6 +217,12 @@ to obtain initial credentials from a KDC using a private key and a certificate. %changelog +* Tue Jan 5 2010 Nalin Dahyabhai - 1.7-16 +- use %%global instead of %%define + +* Mon Jan 4 2010 Dennis Gregorovic +- fix conditional for future RHEL + * Mon Jan 4 2010 Nalin Dahyabhai - 1.7-15 - add upstream patch for KDC crash during referral processing (CVE-2009-3295), via Tom Yu (#545002)