From 56fd0957155af7c127d7c40b23fbac6a6b94c3da Mon Sep 17 00:00:00 2001
From: Piotr Sawicki
Date: Thu, 11 May 2017 09:30:50 +0200
Subject: [PATCH] Update package version in spec to 1.15.1
---
packaging/krb5.spec | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/packaging/krb5.spec b/packaging/krb5.spec
index 3f9843f..ab6bac0 100644
--- a/packaging/krb5.spec
+++ b/packaging/krb5.spec
@@ -17,7 +17,7 @@
%define build_mini 0
-%define srcRoot krb5-1.10.2
+%define srcRoot krb5-1.15.1
%define krb5docdir %{_defaultdocdir}/krb5
Name: krb5
@@ -28,7 +28,7 @@ BuildRequires: keyutils
BuildRequires: keyutils-devel
BuildRequires: libcom_err-devel
BuildRequires: ncurses-devel
-Version: 1.10.2
+Version: 1.15.1
Release: 0
Summary: MIT Kerberos5 Implementation--Libraries
License: MIT
@@ -65,7 +65,6 @@ cp %{SOURCE1001} .
# needs to be re-generated
rm -f src/lib/krb5/krb/deltat.c
cd src
-./util/reconf
LDFLAGS+=" -ldl "
CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing -D_GNU_SOURCE -fPIC -fgnu89-inline " \
./configure \
@@ -94,7 +93,7 @@ cd src
make DESTDIR=%{buildroot} install
cd ..
# Munge the krb5-config script to remove rpaths and CFLAGS.
-sed "s|^CC_LINK=.*|CC_LINK='\$(CC) \$(PROG_LIBPATH)'|g" src/krb5-config > $RPM_BUILD_ROOT/usr/lib/mit/bin/krb5-config
+sed "s|^CC_LINK=.*|CC_LINK='\$(CC) \$(PROG_LIBPATH)'|g" src/build-tools/krb5-config > $RPM_BUILD_ROOT/usr/lib/mit/bin/krb5-config
# install autoconf macro
mkdir -p %{buildroot}/%{_datadir}/aclocal
install -m 644 src/util/ac_check_krb5.m4 %{buildroot}%{_datadir}/aclocal/
@@ -162,19 +161,17 @@ rm -rf %{buildroot}/usr/lib/mit/share/locale
%{_libdir}/libkadm5clnt.so
%{_libdir}/libkadm5srv_mit.so
%{_libdir}/libkadm5srv.so
+%{_libdir}/libkrad.so
%{_libdir}/libkdb5.so
%{_libdir}/libkrb5.so
%{_libdir}/libkrb5support.so
%{_libdir}/libverto.so
-%{_libdir}/libverto-k5ev.so
%{_includedir}/*
/usr/lib/mit/bin/krb5-config
/usr/lib/mit/sbin/krb5-send-pr
-/usr/lib/mit/share/gnats
-%{_mandir}/man1/krb5-send-pr.1*
%{_mandir}/man1/krb5-config.1*
%{_datadir}/aclocal/ac_check_krb5.m4
-
+%{_libdir}/pkgconfig/*
%files
%manifest %{name}.manifest
@@ -186,6 +183,7 @@ rm -rf %{buildroot}/usr/lib/mit/share/locale
%dir %{_libdir}/krb5/plugins/kdb
%dir %{_libdir}/krb5/plugins/preauth
%dir %{_libdir}/krb5/plugins/libkrb5
+%dir %{_libdir}/krb5/plugins/tls
%dir %{_localstatedir}/lib/kerberos/
%dir %{_localstatedir}/lib/kerberos/krb5kdc
%attr(0700,root,root) %dir /var/log/krb5
@@ -193,22 +191,19 @@ rm -rf %{buildroot}/usr/lib/mit/share/locale
%dir /usr/lib/mit/sbin
%dir /usr/lib/mit/bin
%doc %{krb5docdir}/README
-#%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf
-#%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kdc.conf
-#%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
-#%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
%{_libdir}/libgssapi_krb5.*
%{_libdir}/libgssrpc.so.*
%{_libdir}/libk5crypto.so.*
%{_libdir}/libkadm5clnt_mit.so.*
%{_libdir}/libkadm5srv_mit.so.*
+%{_libdir}/libkrad.so.*
%{_libdir}/libkdb5.so.*
%{_libdir}/libkrb5.so.*
%{_libdir}/libkrb5support.so.*
%{_libdir}/libverto.so.*
-%{_libdir}/libverto-k5ev.so.*
%{_libdir}/krb5/plugins/kdb/*
-#/usr/lib/mit/sbin/*
+%{_libdir}/krb5/plugins/preauth/*
+%{_libdir}/krb5/plugins/tls/*
/usr/lib/mit/sbin/kadmin.local
/usr/lib/mit/sbin/kadmind
/usr/lib/mit/sbin/kpropd
@@ -234,20 +229,18 @@ rm -rf %{buildroot}/usr/lib/mit/share/locale
/usr/lib/mit/bin/sclient
/usr/lib/mit/bin/gss-client
/usr/lib/mit/bin/sim_client
-#/usr/bin/kinit
-#/usr/bin/klist
%{_mandir}/man1/kvno.1*
%{_mandir}/man1/kinit.1*
%{_mandir}/man1/kdestroy.1*
%{_mandir}/man1/kpasswd.1*
%{_mandir}/man1/klist.1*
-%{_mandir}/man1/kerberos.1*
%{_mandir}/man1/ksu.1*
%{_mandir}/man1/sclient.1*
%{_mandir}/man1/kadmin.1*
%{_mandir}/man1/ktutil.1*
%{_mandir}/man1/k5srvutil.1*
%{_mandir}/man1/kswitch.1*
+%{_mandir}/man1/krb5-config.1*
%{_mandir}/man5/*
%{_mandir}/man5/.k5login.5.gz
%{_mandir}/man5/.k5identity.5*
--
2.7.4