bird: Update to 2.0.2

[ipfire-3.x.git] / krb5 / krb5.nm

diff --git a/krb5/krb5.nm b/krb5/krb5.nm
index a80872d1cd1725bfc5f345040519f36f37060f06..6370a9ce17c074601a9fa839ffabe687868ffa30 100644 (file)
--- a/krb5/krb5.nm
+++ b/krb5/krb5.nm
@@ -4,10 +4,11 @@
 ###############################################################################
 
 name       = krb5
-version    = %{version_maj}.%{version_min}
-version_maj= 1.10
-version_min= 2
-release    = 1
+#version    = %{version_maj}.%{version_min}
+version    = %{version_maj}
+version_maj= 1.15
+version_min=
+release    = 2
 
 groups     = System/Libraries
 url        = http://web.mit.edu/kerberos/www/
@@ -20,47 +21,18 @@ description
        practice of sending passwords over the network in unencrypted form.
 end
 
-# Upstream only provides a "signed" tarball which contains the actual
-# tar archive.
-#source_dl  = http://we1b.mit.edu/kerberos/dist/krb5/%{version_maj}/
-#sources    = %{thisapp}-signed.tar
-
-patches
-       krb5-1.10.2-pam.patch
-       krb5-1.10.2-manpaths.patch
-       krb5-1.10.2-selinux-label.patch
-       krb5-1.3.1-dns.patch
-       krb5-1.3.4-send-pr-tempfile.patch
-       krb5-1.7-ktany.patch
-       krb5-1.8-api.patch
-       krb5-1.9-debuginfo.patch0
-       krb5-1.9-dirsrv-accountlock.patch
-       krb5-1.10-buildconf.patch
-       krb5-1.10-doublelog.patch
-       krb5-1.10-gcc47.patch0
-       krb5-1.10-kpasswd_tcp.patch
-       krb5-1.10-kprop-mktemp.patch
-       krb5-1.10-ksu-access.patch
-       krb5-1.10-ksu-path.patch
-       krb5-1.10.2-keytab-etype.patch
-       krb5-kvno-230379.patch
-       krb5-tex-pdf.sh
-       krb5-trunk-7046.patch
-       krb5-trunk-7047.patch
-       krb5-trunk-7048.patch
-       krb5-trunk-pkinit-anchorsign.patch
-end
+source_dl   = http://web.mit.edu/kerberos/dist/krb5/%{version_maj}/
 
 build
        requires
                autoconf
                automake
-               bison
+               bison >= 3.0.4-2
                dejagnu
-               e2fsprogs-devel
                flex
                gettext
-               libselinux-devel
+               libcom_err-devel
+               libss-devel
                ncurses-devel
                openldap-devel
                openssl-devel
@@ -71,26 +43,6 @@ build
                texinfo
        end
 
-       prepare_cmds
-               pushd src
-               for file in appl/sample/sserver/sserver.M \
-                               config-files/kdc.conf.M \
-                               config-files/krb5.conf.M \
-                               gen-manpages/kerberos.M \
-                               kadmin/cli/kadmin.M \
-                               slave/kpropd.M \
-                               slave/kprop.M; do
-                       mv -v ${file} ${file}.in
-               done
-
-               rm -vf lib/krb5/krb/deltat.c
-
-               # Regenerate configure scripts.
-               autoheader
-               autoconf
-               popd
-       end
-
        configure_options += \
                --enable-shared \
                --disable-rpath \
@@ -103,8 +55,7 @@ build
                --with-dirsrv \
                --enable-pkinit \
                --with-crypto-impl=openssl \
-               --with-pam \
-               --with-selinux
+               --with-pam
 
        # Don't use strlcpy that comes with glibc.
        configure_options += \
@@ -112,21 +63,13 @@ build
 
        build
                cd %{DIR_APP}/src
+
                ./configure \
                        %{configure_options}
 
                make %{PARALLELISMFLAGS}
        end
 
-       test
-               make -C src fake-install
-               tmpdir=$(mktemp -d)
-
-               # Disable the following tests, because the don't work in the chroot env.
-               #make -C src/lib check TMPDIR=${tmpdir}
-               #make -C src/kdc check TMPDIR=${tmpdir}
-       end
-
        install
                # Install krb5.
                make -C src install DESTDIR=%{BUILDROOT}
@@ -235,7 +178,7 @@ packages
                template DEVEL
 
                requires
-                       libselinux-devel
+                       libcom_err-devel
                end
        end