Fix problem with ccache_name logic in previous build

This commit is contained in:
Robbie Harwood 2018-03-20 18:20:01 +00:00
parent 6b1b652d4d
commit 8b49b0644c

View File

@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.16 Version: 1.16
# for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces) # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
Release: 13%{?dist} Release: 14%{?dist}
# lookaside-cached sources; two downloads and a build artifact # lookaside-cached sources; two downloads and a build artifact
Source0: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}%{prerelease}.tar.gz Source0: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}%{prerelease}.tar.gz
@ -428,7 +428,7 @@ mkdir -m 755 -p $RPM_BUILD_ROOT/etc/gss/mech.d
%if 0%{?configure_default_ccache_name} %if 0%{?configure_default_ccache_name}
export DEFCCNAME="%{configured_default_ccache_name}" export DEFCCNAME="%{configured_default_ccache_name}"
awk '{print} awk '{print}
/^# default_realm/{print " default_ccache_name =", ENVIRON["DEFCCNAME"]}' \ /^# default_realm/{print " default_ccache_name =", ENVIRON["DEFCCNAME"]}' \
%{SOURCE6} > $RPM_BUILD_ROOT/etc/krb5.conf %{SOURCE6} > $RPM_BUILD_ROOT/etc/krb5.conf
touch -r %{SOURCE6} $RPM_BUILD_ROOT/etc/krb5.conf touch -r %{SOURCE6} $RPM_BUILD_ROOT/etc/krb5.conf
grep default_ccache_name $RPM_BUILD_ROOT/etc/krb5.conf grep default_ccache_name $RPM_BUILD_ROOT/etc/krb5.conf
@ -724,6 +724,9 @@ exit 0
%{_libdir}/libkadm5srv_mit.so.* %{_libdir}/libkadm5srv_mit.so.*
%changelog %changelog
* Tue Mar 20 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-13
- Fix problem with ccache_name logic in previous build
* Tue Mar 20 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-13 * Tue Mar 20 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-13
- Add pkinit_anchors default value to krb5.conf - Add pkinit_anchors default value to krb5.conf
- Reindent krb5.conf to not be terrible - Reindent krb5.conf to not be terrible