- 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 0fc6ce026920d4dfdfa08e3568f43e198a42baeb..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
@@ -13,29 +13,52 @@ Summary(tr.UTF-8):  Sürüm denetim sistemi
 Summary(uk.UTF-8):     Система керування версіями
 Summary(zh_CN.UTF-8):  并发的版本管理系统CVS
 Name:          cvs
-Version:       1.11.22
-Release:       2
+Version:       1.12.13
+Release:       6
 License:       GPL
 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: f24043a640509aff1aa28871dd345762
+Source0:       ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: 956ab476ce276c2d19d583e227dbdbea
 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
-Patch1:                %{name}-zlib.patch
-Patch2:                %{name}-fixed_buffer.patch
-Patch3:                %{name}-home_etc.patch
-Patch4:                %{name}-newnline.patch
-Patch5:                %{name}-no_libnsl.patch
-Patch6:                %{name}-info.patch
-Patch7:                %{name}-posix.patch
-Patch8:                %{name}-CAN_2005_2693.patch
-Patch9:                %{name}-cvspass.patch
+Patch1:                %{name}-fixed_buffer.patch
+Patch2:                %{name}-home_etc.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-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
+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-R-warning.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-server-wrapper.patch
+Patch121:      %{name}-debian-repouid.patch
+Patch122:      %{name}-debian-rsc2log.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
@@ -198,7 +221,6 @@ pserver.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -209,16 +231,49 @@ pserver.
 %patch8 -p1
 %patch9 -p1
 
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+# undefined reference to getpwline
+#%patch106 -p1
+%patch107 -p2
+%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
+
+rm -rf zlib && sed -i -e 's#zlib/Makefile##g' configure.in
+
+# broken implementation, never use
+rm lib/getcwd.c
+
 %build
-%{__aclocal}
+rm aclocal.m4
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
+       --with-external-zlib \
+       --enable-encryption \
        --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