SPECS: cvs.spec - rel 2; add 26 patches from debian

[arekm]

Author: arekm                        Date: Tue Nov  6 07:38:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; add 26 patches from debian

---- Files affected:
SPECS:
   cvs.spec (1.174 -> 1.175) 

---- Diffs:

================================================================
Index: SPECS/cvs.spec
diff -u SPECS/cvs.spec:1.174 SPECS/cvs.spec:1.175
--- SPECS/cvs.spec:1.174	Mon Nov  5 20:54:12 2007
+++ SPECS/cvs.spec	Tue Nov  6 08:37:56 2007
@@ -15,7 +15,7 @@
 Summary(zh_CN.UTF-8):	并发的版本管理系统CVS
 Name:		cvs
 Version:	1.12.13
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Version Control
 Source0:	ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2
@@ -29,6 +29,36 @@
 Patch6:		%{name}-posix.patch
 Patch7:		%{name}-CAN_2005_2693.patch
 Patch8:		%{name}-cvspass.patch
+
+# patches from debian
+Patch100:	%{name}-debian-64bit-crash.patch
+Patch101:	%{name}-debian-check-method-crash.patch
+Patch102:	%{name}-debian-cvsbug.patch
+Patch103:	%{name}-debian-cvspass.patch
+Patch104:	%{name}-debian-cvsrc.patch
+Patch105:	%{name}-debian-date-format.patch
+Patch106:	%{name}-debian-dsa-ext-pwd.patch
+Patch107:	%{name}-debian-ext-exp.patch
+Patch108:	%{name}-debian-extra-tags.patch
+Patch109:	%{name}-debian-flag-conflicted-copies.patch
+Patch110:	%{name}-debian-homedir.patch
+Patch111:	%{name}-debian-import-n-X.patch
+Patch112:	%{name}-debian-info.patch
+Patch113:	%{name}-debian-keyword-alnum.patch
+Patch114:	%{name}-debian-l-opt.patch
+Patch115:	%{name}-debian-newlines-commit-template.patch
+Patch116:	%{name}-debian-normalize-roots.patch
+Patch117:	%{name}-debian-pam.patch
+Patch118:	%{name}-debian-parseopts.patch
+Patch119:	%{name}-debian-perms.patch
+Patch120:	%{name}-debian-rcs2log-sort.patch
+Patch121:	%{name}-debian-repouid.patch
+Patch122:	%{name}-debian-rsc2log.patch
+Patch123:	%{name}-debian-R-warning.patch
+Patch124:	%{name}-debian-server-wrapper.patch
+Patch125:	%{name}-debian-sparc.patch
+Patch126:	%{name}-debian-zlib-read-compressed.patch
+
 URL:		http://www.nongnu.org/cvs/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1:1.7.9
@@ -204,6 +234,34 @@
 %patch7 -p1
 %patch8 -p1
 
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
+%patch113 -p1
+%patch114 -p1
+%patch115 -p1
+%patch116 -p1
+%patch117 -p1
+%patch118 -p1
+%patch119 -p1
+%patch120 -p1
+%patch121 -p1
+%patch122 -p1
+%patch123 -p1
+%patch124 -p1
+%patch125 -p1
+%patch126 -p1
+
 %build
 rm aclocal.m4
 %{__aclocal} -I m4
@@ -286,6 +344,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.175  2007/11/06 07:37:56  arekm
+- rel 2; add 26 patches from debian
+
 Revision 1.174  2007/11/05 19:54:12  arekm
 - up to 1.12.13 (1.11 series on CVS_1_11 tag)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cvs.spec?r1=1.174&r2=1.175&f=u