- rel 3 (2 for RA)

[packages/cvs.git] / cvs.spec

diff --git a/cvs.spec b/cvs.spec
index 572d7c495e63a8fc41dcda8526777f19f96c9fd6..89f1d3ce76ef4fc73c4822aa7d5649feb65b7dd5 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -1,7 +1,8 @@
 #
 # Conditional build:
 %bcond_without kerberos5       # disable kerberos5 support
-
+%bcond_without acl             # disable ACL support
+#
 Summary:       Concurrent Versioning System
 Summary(de):   Concurrent-Versioning-System
 Summary(es):   Control de versiones en modo concurrente
@@ -13,13 +14,13 @@ Summary(tr):        S
 Summary(uk):   óÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ×ÅÒÓ¦ÑÍÉ
 Summary(zh_CN):        ²¢·¢µÄ°æ±¾¹ÜÀíϵͳCVS
 Name:          cvs
-Version:       1.11.9
-Release:       1
+Version:       1.11.18
+Release:       3
 License:       GPL
 Group:         Development/Version Control
-# new feature release: http://ftp.cvshome.org/release/feature/cvs-1.12.1/cvs-1.12.1.tar.bz2
-Source0:       http://ftp.cvshome.org/release/stable/%{name}-%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 0e72f5de87f66c5fcd27d58b53fcbf43
+# new feature release: http://ftp.cvshome.org/release/feature/cvs-1.12.5/cvs-1.12.5.tar.bz2
+Source0:       http://ccvs.cvshome.org/files/documents/19/534/%{name}-%{version}.tar.bz2
+# Source0-md5: 1dd5c16064906617e4358738bfe59b66
 Source1:       %{name}.inetd
 # based on:    http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/cvs-1.11.2-20020513-ipv6.patch.gz
 Patch0:                %{name}-ipv6.patch
@@ -30,15 +31,20 @@ Patch4:             %{name}-home_etc.patch
 Patch5:                %{name}-newnline.patch
 Patch6:                %{name}-no_libnsl.patch
 Patch7:                %{name}-info.patch
+Patch8:                %{name}-ssh.patch
+Patch9:                %{name}-posix.patch
+# Access Control List Extension: http://cvsacl.sourceforge.net/
+Patch10:       %{name}-acl.patch
 URL:           http://www.cyclic.com/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: zlib-devel
+BuildRequires: autoconf >= 2.58
+BuildRequires: automake >= 1:1.7.9
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
+BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: zlib-devel
 Obsoletes:     cvs-nserver-client
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _cvs_root       /home/services/cvsroot
+%define                _cvs_root       /var/lib/cvs
 
 %description
 CVS means Concurrent Version System; it is a version control system
@@ -163,9 +169,9 @@ CVS 
 %package pserver
 Summary:       rc-inetd config files to run CVS pserver
 Summary(es):   Ficheros de configuración de rc-inetd para un servidor CVS pserver
-Summary(pl):   Pliki konfiguracyjne rc-ineta do postawienia pservera CVS
+Summary(pl):   Pliki konfiguracyjne rc-inetd do postawienia pservera CVS
 Group:         Development/Version Control
-PreReq:                %{name} = %{version}
+PreReq:                %{name} = %{version}-%{release}
 PreReq:                rc-inetd
 Requires(pre): /usr/bin/getgid
 Requires(pre): /bin/id
@@ -174,6 +180,8 @@ Requires(pre):      /usr/sbin/useradd
 Requires(post):        fileutils
 Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
+Provides:      group(cvs)
+Provides:      user(cvs)
 Obsoletes:     cvs-nserver-common
 Obsoletes:     cvs-nserver-nserver
 Obsoletes:     cvs-nserver-pserver
@@ -200,6 +208,9 @@ pserver.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%{?with_acl:%patch10 -p1}
 
 %build
 %{__aclocal}
@@ -209,8 +220,10 @@ pserver.
 %configure \
        --enable-server \
        --enable-client \
-       --with-gssapi \
-       --with-tmpdir=/tmp
+       --with%{!?with_kerberos5:out}-gssapi \
+       --with-tmpdir=/tmp \
+       --with-editor=/bin/vi
+
 %{__make}
 
 %install
@@ -264,17 +277,21 @@ fi
 
 %postun pserver
 if [ "$1" = "0" ]; then
-       # Remove user and group
-       /usr/sbin/userdel cvs 2>/dev/null
-       /usr/sbin/groupdel cvs 2>/dev/null
+       %userremove cvs
+       %groupremove cvs
        if [ -f /var/lock/subsys/rc-inetd ]; then
                /etc/rc.d/init.d/rc-inetd reload
        fi
 fi
 
+%triggerpostun -- cvs-pserver < 1.1.13-1
+echo "Warning: default cvsroot moved to %{_cvs_root}."
+echo "Check your configration."
+
 %files
 %defattr(644,root,root,755)
-%doc BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README ChangeLog doc/*.ps contrib
+%doc BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README %{?with_acl:README.cvsacl}
+%doc ChangeLog doc/*.ps contrib
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man[158]/*
 %{_infodir}/cvs*