- use %%global instead of %%define

- fix conditional for future RHEL
This commit is contained in:
Nalin Dahyabhai 2010-01-05 22:55:30 +00:00
parent 14efc0c6dd
commit 65631fa1bb

View File

@ -1,16 +1,16 @@
%define WITH_LDAP 1 %global WITH_LDAP 1
%define WITH_OPENSSL 1 %global WITH_OPENSSL 1
%define WITH_DIRSRV 1 %global WITH_DIRSRV 1
%define krb5prefix %{_prefix}/kerberos %global krb5prefix %{_prefix}/kerberos
# For consistency with regular login. # For consistency with regular login.
%define login_pam_service remote %global login_pam_service remote
Summary: The Kerberos network authentication system Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.7 Version: 1.7
Release: 15%{?dist} Release: 16%{?dist}
# Maybe we should explode from the now-available-to-everybody tarball instead? # 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 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
Source0: krb5-%{version}.tar.gz Source0: krb5-%{version}.tar.gz
@ -87,7 +87,7 @@ URL: http://web.mit.edu/kerberos/www/
Group: System Environment/Libraries Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, bison, flex, gawk BuildRequires: autoconf, bison, flex, gawk
%if 0%{?fedora} >= 12 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
BuildRequires: libcom_err-devel, libss-devel BuildRequires: libcom_err-devel, libss-devel
%endif %endif
BuildRequires: gzip, ncurses-devel, rsh, texinfo, texinfo-tex, tar 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. certificate.
%changelog %changelog
* Tue Jan 5 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-16
- use %%global instead of %%define
* Mon Jan 4 2010 Dennis Gregorovic <dgregor@redhat.com>
- fix conditional for future RHEL
* Mon Jan 4 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-15 * Mon Jan 4 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.7-15
- add upstream patch for KDC crash during referral processing (CVE-2009-3295), - add upstream patch for KDC crash during referral processing (CVE-2009-3295),
via Tom Yu (#545002) via Tom Yu (#545002)