SPECS (RA-branch): cvs.spec - merged ACL patch from HEAD

[hawk]

Author: hawk                         Date: Tue Aug 16 15:00:14 2005 GMT
Module: SPECS                         Tag: RA-branch
---- Log message:
- merged ACL patch from HEAD

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

---- Diffs:

================================================================
Index: SPECS/cvs.spec
diff -u SPECS/cvs.spec:1.120.2.9 SPECS/cvs.spec:1.120.2.10
--- SPECS/cvs.spec:1.120.2.9	Sat Jul 30 22:43:50 2005
+++ SPECS/cvs.spec	Tue Aug 16 17:00:02 2005
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_with	kerberos5	# enable kerberos5 support
+%bcond_without	acl		# enable ACL support
 #
 Summary:	Concurrent Versioning System
 Summary(de):	Concurrent-Versioning-System
@@ -15,9 +16,9 @@
 Summary(zh_CN):	˛˘ˇ˘ľÄ°ćąžšÜŔíϾͳCVS
 Name:		cvs
 Version:	1.11.20
-Release:	1.1
+Release:	1.2
 License:	GPL
-Group:		Development/Version Control
+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
@@ -31,6 +32,8 @@
 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.
 BuildRequires:	autoconf >= 2.57
@@ -203,6 +206,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%{?with_acl:%patch8 -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
@@ -282,7 +286,8 @@
 
 %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*
@@ -298,6 +303,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.10  2005/08/16 15:00:02  hawk
+- merged ACL patch from HEAD
+
 Revision 1.120.2.9  2005/07/30 20:43:50  hawk
 - updated to 1.11.20
 - release 1.1 for Ra
================================================================

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