Author: blues Date: Sun Nov 11 21:35:25 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - rel.6 - newnline patch is obsoleted by debian-newlines-commit-template patch (avoid 2 new lines in commit message); rename kerberos5 bcond to krb5.
---- Files affected: SPECS: cvs.spec (1.179 -> 1.180) ---- Diffs: ================================================================ Index: SPECS/cvs.spec diff -u SPECS/cvs.spec:1.179 SPECS/cvs.spec:1.180 --- SPECS/cvs.spec:1.179 Thu Nov 8 01:04:09 2007 +++ SPECS/cvs.spec Sun Nov 11 22:35:20 2007 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # # 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 @@ -15,7 +15,7 @@ Summary(zh_CN.UTF-8): 并发的版本管理系统CVS Name: cvs Version: 1.12.13 -Release: 5 +Release: 6 License: GPL Group: Development/Version Control Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2 @@ -23,14 +23,13 @@ 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 @@ -60,7 +59,7 @@ 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 @@ -232,7 +231,6 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 %patch100 -p1 %patch101 -p1 @@ -276,7 +274,7 @@ --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 @@ -346,6 +344,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.180 2007-11-11 21:35:20 blues +- rel.6 - newnline patch is obsoleted by debian-newlines-commit-template + patch (avoid 2 new lines in commit message); rename kerberos5 bcond to + krb5. + Revision 1.179 2007-11-08 00:04:09 arekm - rel 5; apply patches to source code; not just debian subdirectory ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cvs.spec?r1=1.179&r2=1.180&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
