diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-09-13 09:13:37 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2013-09-13 09:13:37 -0400 |
| commit | 21b73fcc00b4639091332b9f876133c7e1053cbe (patch) | |
| tree | eba09e33aed1573df5d3eb027bb9bad186d12f6b | |
| parent | 51283246770828195e4604432e4c0f4bdb007129 (diff) | |
| download | krb5-21b73fcc00b4639091332b9f876133c7e1053cbe.tar.gz krb5-21b73fcc00b4639091332b9f876133c7e1053cbe.tar.xz krb5-21b73fcc00b4639091332b9f876133c7e1053cbe.zip | |
pull the newer F21 defaults back to F20 (sgallagh)krb5-1.11.3-12.fc21krb5-1.11.3-12.fc20
| -rw-r--r-- | krb5.spec | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -29,11 +29,11 @@ # Guess where the -libs subpackage's docs are going to go. %define libsdocdir %{?_pkgdocdir:%(echo %{_pkgdocdir} | sed -e s,krb5,krb5-libs,g)}%{!?_pkgdocdir:%{_docdir}/%{name}-libs-%{version}} # Figure out where the default ccache lives and how we set it. -%if 0%{?fedora} > 18 && 0%{?fedora} < 21 +%if 0%{?fedora} > 18 && 0%{?fedora} < 20 %global compile_default_ccache_name 1 %global compiled_default_ccache_name DIR:/run/user/%%{uid}/krb5cc %endif -%if 0%{?fedora} >= 21 || 0%{?rhel} > 6 +%if 0%{?fedora} >= 20 || 0%{?rhel} > 6 %global configure_default_ccache_name 1 %global configured_default_ccache_name KEYRING:persistent:%%{uid} %endif @@ -41,7 +41,7 @@ Summary: The Kerberos network authentication system Name: krb5 Version: 1.11.3 -Release: 11%{?dist} +Release: 12%{?dist} # Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.3-signed.tar Source0: krb5-%{version}.tar.gz @@ -332,7 +332,7 @@ ln -s NOTICE LICENSE %patch126 -p1 -b .skew2 %patch127 -p1 -b .test_gss_no_udp %patch128 -p1 -b .test_no_pmap -%if 0%{?fedora} > 18 && 0%{?fedora} < 21 +%if 0%{?fedora} > 18 && 0%{?fedora} < 20 # Applied when the hard-wired default location is DIR:/run/user/%%{uid}/krb5cc. %patch129 -p1 -b .run_user_0 %endif @@ -971,6 +971,9 @@ exit 0 %{_sbindir}/uuserver %changelog +* Fri Sep 13 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.11.3-12 +- pull the newer F21 defaults back to F20 (sgallagh) + * Mon Sep 9 2013 Nalin Dahyabhai <nalin@redhat.com> - only apply the patch to autocreate /run/user/0 when we're hard-wiring the default ccache location to be under it; otherwise it's unnecessary |