SPECS (RA-branch): cvs.spec - merged from HEAD: update to 1.11.21, ...

[hawk]

Author: hawk                         Date: Fri Dec  2 11:35:33 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- merged from HEAD: update to 1.11.21, ssh, posix and CAN_2005_2693 patches,
  new URLs
- removed ACL patch
- release 1.1 for Ra

---- Files affected:
SPECS:
   cvs.spec (1.120.2.10 -> 1.120.2.11) 

---- Diffs:

================================================================
Index: SPECS/cvs.spec
diff -u SPECS/cvs.spec:1.120.2.10 SPECS/cvs.spec:1.120.2.11
--- SPECS/cvs.spec:1.120.2.10	Tue Aug 16 17:00:02 2005
+++ SPECS/cvs.spec	Fri Dec  2 12:35:27 2005
@@ -2,7 +2,6 @@
 #
 # Conditional build:
 %bcond_with	kerberos5	# enable kerberos5 support
-%bcond_without	acl		# enable ACL support
 #
 Summary:	Concurrent Versioning System
 Summary(de):	Concurrent-Versioning-System
@@ -15,13 +14,13 @@
 Summary(uk):	óÉÓÔĹÍÁ ËĹŇŐ×ÁÎÎŃ ×ĹŇÓŚŃÍÉ
 Summary(zh_CN):	˛˘ˇ˘ľÄ°ćąžšÜŔíϾͳCVS
 Name:		cvs
-Version:	1.11.20
-Release:	1.2
+Version:	1.11.21
+Release:	1.1
 License:	GPL
-Group:		DevAelopment/Version Control
-# new feature release: https://www.cvshome.org/files/documents/19/610/cvs-1.12.11.tar.bz2
-Source0:	https://ccvs.cvshome.org/files/documents/19/861/%{name}-%{version}.tar.bz2
-# Source0-md5:	9e215c0ee3bb7dfb76515d7cd81a3742
+Group:		Development/Version Control
+# new: ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	54dd9eeb0648c9eef680df7cb26c710e
 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
@@ -32,12 +31,12 @@
 Patch5:		%{name}-newnline.patch
 Patch6:		%{name}-no_libnsl.patch
 Patch7:		%{name}-info.patch
-# Access Control List Extension: http://cvsacl.sourceforge.net/
-Patch8:		%{name}-acl.patch
-URL:		http://www.cvshome.org/
-# should be 2.58/1.7.9 resp.
+Patch8:		%{name}-ssh.patch
+Patch9:		%{name}-posix.patch
+Patch10:	%{name}-CAN_2005_2693.patch
+URL:		http://www.non-gnu.org/cvs/
 BuildRequires:	autoconf >= 2.57
-BuildRequires:	automake >= 1.7.6
+BuildRequires:	automake >= 1:1.7.6
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 BuildRequires:	texinfo
 BuildRequires:	zlib-devel
@@ -171,7 +170,7 @@
 Summary(es):	Ficheros de configuración de rc-inetd para un servidor CVS pserver
 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
@@ -189,8 +188,8 @@
 mode.
 
 %description pserver -l es
-Los ficheros de configuración rc-inetd necesarios para ejecutar CVS
-en el modo de pserver.
+Los ficheros de configuración rc-inetd necesarios para ejecutar CVS en
+el modo de pserver.
 
 %description pserver -l pl
 Pliki konfiguracyjne rc-inetd niezbędne do uruchomienia CVSa w trybie
@@ -206,7 +205,9 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%{?with_acl:%patch8 -p1}
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 # seems not-so-really needed yet
 %{__perl} -pi -e 's/(AC_PREREQ)\(2\.58\)/$1\(2.57\)/;s/(AM_INIT_AUTOMAKE.*)1\.7\.9/${1}1.7.6/' configure.in
@@ -219,7 +220,8 @@
 %configure \
 	--enable-server \
 	--enable-client \
-	%{?with_kerberos5:--with-gssapi} \
+	--enable-rootcommit \
+	--with%{!?with_kerberos5:out}-gssapi \
 	--with-tmpdir=/tmp \
 	--with-editor=/bin/vi
 
@@ -286,8 +288,8 @@
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README %{?with_acl:README.cvsacl}
-%doc ChangeLog doc/*.ps contrib
+%doc BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README
+%doc ChangeLog doc/*.pdf contrib
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man[158]/*
 %{_infodir}/cvs*
@@ -295,7 +297,7 @@
 %files pserver
 %defattr(644,root,root,755)
 %attr(770,root,cvs) %dir %{_cvs_root}
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/cvs
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/cvs
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -303,6 +305,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.11  2005/12/02 11:35:27  hawk
+- merged from HEAD: update to 1.11.21, ssh, posix and CAN_2005_2693 patches,
+  new URLs
+- removed ACL patch
+- release 1.1 for Ra
+
 Revision 1.120.2.10  2005/08/16 15:00:02  hawk
 - merged ACL patch from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cvs.spec?r1=1.120.2.10&r2=1.120.2.11&f=u