- updated ac/am BRs, use kerberos5 bcond in build

- release 2 (1 is for Ra)

Changed files:
    cvs.spec -> 1.118

diff --git a/cvs.spec b/cvs.spec
index 2b6b5e0e733b9550b4f8fa2032140636b6516c5d..ede47da0c5b3c598982182954fafb4e3982306ff 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -14,7 +14,7 @@ Summary(uk):  
 Summary(zh_CN):        ²¢·¢µÄ°æ±¾¹ÜÀíϵͳCVS
 Name:          cvs
 Version:       1.11.10
-Release:       1
+Release:       2
 License:       GPL
 Group:         Development/Version Control
 # new feature release: http://ftp.cvshome.org/release/feature/cvs-1.12.3/cvs-1.12.3.tar.bz2
@@ -31,10 +31,10 @@ Patch5:             %{name}-newnline.patch
 Patch6:                %{name}-no_libnsl.patch
 Patch7:                %{name}-info.patch
 URL:           http://www.cyclic.com/
-BuildRequires: autoconf >= 2.57
-BuildRequires: automake >= 1.5
-BuildRequires: zlib-devel
+BuildRequires: autoconf >= 2.58
+BuildRequires: automake >= 1.7.5
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
+BuildRequires: zlib-devel
 Obsoletes:     cvs-nserver-client
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -209,8 +209,9 @@ pserver.
 %configure \
        --enable-server \
        --enable-client \
-       --with-gssapi \
+       %{?with_kerberos5:--with-gssapi} \
        --with-tmpdir=/tmp
+
 %{__make}
 
 %install