- rel.6 - newnline patch is obsoleted by debian-newlines-commit-template

[packages/cvs.git] / cvs.spec

diff --git a/cvs.spec b/cvs.spec
index c45073f106e30cf5b373816df7f7bb0e995f7c01..13568a3907e2d59e5d75ff39bd26abdd3a4cf438 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without kerberos5       # disable kerberos5 support
+%bcond_without krb5    # disable krb5 support
 #
 Summary:       Concurrent Versioning System
 Summary(de.UTF-8):     Concurrent-Versioning-System
@@ -14,7 +14,7 @@ Summary(uk.UTF-8):    Система керування версіями
 Summary(zh_CN.UTF-8):  并发的版本管理系统CVS
 Name:          cvs
 Version:       1.12.13
-Release:       4
+Release:       6
 License:       GPL
 Group:         Development/Version Control
 Source0:       ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2
@@ -22,20 +22,19 @@ Source0:    ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{versi
 Source1:       %{name}.inetd
 Patch1:                %{name}-fixed_buffer.patch
 Patch2:                %{name}-home_etc.patch
-Patch3:                %{name}-newnline.patch
-Patch4:                %{name}-no_libnsl.patch
-Patch5:                %{name}-info.patch
-Patch6:                %{name}-posix.patch
-Patch7:                %{name}-CAN_2005_2693.patch
-Patch8:                %{name}-cvspass.patch
-Patch9:                %{name}-datetime.patch
-Patch10:       %{name}-getcwd.patch
+Patch3:                %{name}-no_libnsl.patch
+Patch4:                %{name}-info.patch
+Patch5:                %{name}-posix.patch
+Patch6:                %{name}-CAN_2005_2693.patch
+Patch7:                %{name}-cvspass.patch
+Patch8:                %{name}-datetime.patch
+Patch9 :       %{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 +43,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,18 +51,14 @@ 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
 BuildRequires: automake >= 1:1.7.9
-%{?with_kerberos5:BuildRequires:       krb5-devel}
+%{?with_krb5:BuildRequires:    krb5-devel}
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: texinfo
 BuildRequires: zlib-devel
@@ -235,7 +230,6 @@ pserver.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -243,8 +237,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 +255,8 @@ 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
 
 # broken implementation, never use
 rm lib/getcwd.c
@@ -280,7 +273,7 @@ rm aclocal.m4
        --enable-server \
        --enable-client \
        --enable-rootcommit \
-       --with%{!?with_kerberos5:out}-gssapi \
+       --with%{!?with_krb5:out}-gssapi \
        --with-tmpdir=/tmp \
        --with-rsh=%{_bindir}/ssh \
        --with-editor=/bin/vi