- rel 14

[packages/cvs.git] / cvs.spec

diff --git a/cvs.spec b/cvs.spec
index 7df01eda864e02578c78c05b6e7bdd80d2cf2822..12c25dcfeb339f26ffcc95057f011815623ed7a8 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without krb5    # disable krb5 support
+%bcond_without kerberos5       # disable kerberos V support
 #
 Summary:       Concurrent Versioning System
 Summary(de.UTF-8):     Concurrent-Versioning-System
@@ -14,10 +14,10 @@ Summary(uk.UTF-8):  Система керування версіями
 Summary(zh_CN.UTF-8):  并发的版本管理系统CVS
 Name:          cvs
 Version:       1.12.13
-Release:       6
+Release:       14
 License:       GPL
 Group:         Development/Version Control
-Source0:       ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2
 # Source0-md5: 956ab476ce276c2d19d583e227dbdbea
 Source1:       %{name}.inetd
 Patch1:                %{name}-fixed_buffer.patch
@@ -29,6 +29,8 @@ Patch6:               %{name}-CAN_2005_2693.patch
 Patch7:                %{name}-cvspass.patch
 Patch8:                %{name}-datetime.patch
 Patch9:                %{name}-getcwd.patch
+Patch10:       %{name}-ac.patch
+Patch11:       %{name}-printf-n.patch
 
 # patches from debian
 Patch100:      %{name}-debian-64bit-crash.patch
@@ -58,11 +60,14 @@ Patch122:   %{name}-debian-rsc2log.patch
 URL:           http://www.nongnu.org/cvs/
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake >= 1:1.7.9
-%{?with_krb5:BuildRequires:    krb5-devel}
+%{?with_kerberos5:BuildRequires:       heimdal-devel}
+BuildRequires: pam-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: texinfo
 BuildRequires: zlib-devel
 Provides:      cvs-client = %{version}
+Provides:      cvs-gnu-client = %{version}
+Obsoletes:     cvs-client
 Obsoletes:     cvs-nserver-client
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -202,6 +207,7 @@ Requires(pre):      /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
 Requires:      %{name} = %{version}-%{release}
 Requires:      rc-inetd
+Provides:      cvs-gnu-pserver = %{version}-%{release}
 Provides:      group(cvs)
 Provides:      user(cvs)
 Obsoletes:     cvs-nserver-common
@@ -231,6 +237,8 @@ pserver.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -269,12 +277,14 @@ rm aclocal.m4
 %{__autoconf}
 %{__automake}
 %configure \
+       --enable-pam \
+       --with-hardcoded-pam-service-name=cvs \
        --with-external-zlib \
        --enable-encryption \
        --enable-server \
        --enable-client \
        --enable-rootcommit \
-       --with%{!?with_krb5:out}-gssapi \
+       --with%{!?with_kerberos5:out}-gssapi \
        --with-tmpdir=/tmp \
        --with-rsh=%{_bindir}/ssh \
        --with-editor=/bin/vi
@@ -296,11 +306,11 @@ mv -f $RPM_BUILD_ROOT%{_datadir}/cvs/contrib/rcs2log $RPM_BUILD_ROOT%{_bindir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post  -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun        -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %pre pserver
 %groupadd -f -g 52 cvs