- correct a few typos

- note the review bug for splitting out krb5-appl
This commit is contained in:
Nalin Dahyabhai 2010-03-08 20:10:52 +00:00
parent a32fda650f
commit 0f6f154014

View File

@ -7,13 +7,13 @@
# For consistency with regular login. # For consistency with regular login.
%global login_pam_service remote %global login_pam_service remote
# Temporary. # Temporary bundling, pending package review #570951.
%global appl_version 1.0 %global appl_version 1.0
Summary: The Kerberos network authentication system Summary: The Kerberos network authentication system
Name: krb5 Name: krb5
Version: 1.8 Version: 1.8
Release: 1%{?dist} Release: 2%{?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.1-signed.tar # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar
Source0: krb5-%{version}.tar.gz Source0: krb5-%{version}.tar.gz
@ -307,7 +307,7 @@ sed -i -e '1c\
chmod -x doc/krb5-protocol/*.txt doc/*.html doc/*/*.html chmod -x doc/krb5-protocol/*.txt doc/*.html doc/*/*.html
# Rename the man pages so that they'll get generated correctly. Uses the # Rename the man pages so that they'll get generated correctly. Uses the
# "krb5-trunk-manpaths.txt" source file. # "krb5-1.8-manpaths.txt" source file.
pushd src pushd src
cat %{SOURCE25} | while read manpage ; do cat %{SOURCE25} | while read manpage ; do
mv "$manpage" "$manpage".in mv "$manpage" "$manpage".in
@ -351,9 +351,9 @@ autoconf
popd popd
%build %build
cd src pushd src
INCLUDES=-I%{_includedir}/et
# Work out the CFLAGS and CPPFLAGS which we intend to use. # Work out the CFLAGS and CPPFLAGS which we intend to use.
INCLUDES=-I%{_includedir}/et
CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIC`" CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIC`"
CPPFLAGS="`echo $DEFINES $INCLUDES`" CPPFLAGS="`echo $DEFINES $INCLUDES`"
%configure \ %configure \
@ -389,11 +389,12 @@ CPPFLAGS="`echo $DEFINES $INCLUDES`"
--with-selinux --with-selinux
# Now build it. # Now build it.
make %{?_smp_mflags} make %{?_smp_mflags}
popd
# The applications, too. Build everything position-independent. We only get # The applications, too. Build everything position-independent. We only get
# away with this if our build dependencies drag an older krb5-devel onto the # away with this if our build dependencies drag an older krb5-devel onto the
# system. # system.
pushd ../krb5-appl-%{appl_version} pushd krb5-appl-%{appl_version}
CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIE -fno-strict-aliasing`" CFLAGS="`echo $RPM_OPT_FLAGS $DEFINES $INCLUDES -fPIE -fno-strict-aliasing`"
LDFLAGS="-pie" LDFLAGS="-pie"
%configure \ %configure \
@ -409,7 +410,7 @@ make %{?_smp_mflags}
popd popd
# Run the test suite. We can't actually do this in the build system. # Run the test suite. We can't actually do this in the build system.
: make check TMPDIR=%{_tmppath} : make -C src check TMPDIR=%{_tmppath}
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@ -866,7 +867,7 @@ exit 0
%{_sbindir}/uuserver %{_sbindir}/uuserver
%changelog %changelog
* Mon Mar 8 2010 Nalin Dahyabhai <nalin@redhat.com> * Mon Mar 8 2010 Nalin Dahyabhai <nalin@redhat.com> - 1.8-2
- pull up patch to get the client libraries to correctly perform password - pull up patch to get the client libraries to correctly perform password
changes over IPv6 (Sumit Bose, RT#6661) changes over IPv6 (Sumit Bose, RT#6661)