- rel 5; apply patches to source code; not just debian subdirectory

[packages/cvs.git] / cvs.spec

diff --git a/cvs.spec b/cvs.spec
index c1a5660b3849c477767ddee7422e9e7449734d38..71bb728d9ad0dd740999e0ae155111eaaf3eb368 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -14,7 +14,7 @@ Summary(uk.UTF-8):    Система керування версіями
 Summary(zh_CN.UTF-8):  并发的版本管理系统CVS
 Name:          cvs
 Version:       1.12.13
-Release:       4
+Release:       5
 License:       GPL
 Group:         Development/Version Control
 Source0:       ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2
@@ -34,8 +34,8 @@ Patch10:      %{name}-getcwd.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
+Patch102:      %{name}-debian-sparc.patch
+Patch103:      %{name}-debian-zlib-read-compressed.patch
 Patch104:      %{name}-debian-cvsrc.patch
 Patch105:      %{name}-debian-date-format.patch
 Patch106:      %{name}-debian-dsa-ext-pwd.patch
@@ -44,7 +44,7 @@ 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
+Patch112:      %{name}-debian-R-warning.patch
 Patch113:      %{name}-debian-keyword-alnum.patch
 Patch114:      %{name}-debian-l-opt.patch
 Patch115:      %{name}-debian-newlines-commit-template.patch
@@ -52,13 +52,9 @@ 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
+Patch120:      %{name}-debian-server-wrapper.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
@@ -243,8 +239,9 @@ pserver.
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
-%patch106 -p1
-%patch107 -p1
+# undefined reference to getpwline
+#%patch106 -p1
+%patch107 -p2
 %patch108 -p1
 %patch109 -p1
 %patch110 -p1
@@ -260,10 +257,6 @@ pserver.
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1
-%patch123 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
 
 rm -rf zlib && sed -i -e 's#zlib/Makefile##g' configure.in