X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=cvsnt.spec;h=05323cc75f5bdc5afc67419001fc886dfc25f10d;hb=71b477cb857861fe11965b02fccced65cef0d041;hp=419ab1b06ba5e73eda027f367aa985d8c8de162d;hpb=6f427075af06fa0785a5c57a98c1123a2a128dd4;p=packages%2Fcvsnt.git

diff --git a/cvsnt.spec b/cvsnt.spec
index 419ab1b..05323cc 100644
--- a/cvsnt.spec
+++ b/cvsnt.spec
@@ -3,6 +3,13 @@
 %bcond_without	kerberos		# build without krb5 support
 #
 # TODO:
+# - commit -r BRANCH is rejected (contrary to manual)
+#   you can commit new file to branch with this technique:
+#    cvs add file.patch
+#    cvs up -r BRANCH file.patch
+#    cvs ci -m '- bleh' file.patch
+#   or just install cvs client from cvsnt package.
+# - the newline auto translation on text files should be disabled on .patch files (better for any!)
 # - stay with STABLE 2.5.04 line as soon as it becomes stable
 # - check server mode and default config
 # - unpackaged:
@@ -15,13 +22,13 @@
 Summary:	Concurrent Versioning System
 Summary(pl.UTF-8):	Concurrent Versioning System
 Name:		cvsnt
-Version:	2.5.04.2980
-Release:	1
+Version:	2.5.04.3125
+Release:	2
 License:	GPL v2+/LGPL v2+
 Group:		Development/Version Control
 # http://www.cvsnt.org/wiki/Download
 Source0:	http://www.cvsnt.org/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	2f82c5b76cd450edcde714eed52b6377
+# Source0-md5:	b8aae9e50c3ef682a126a5d19c797558
 Source1:	%{name}.inetd
 Source2:	%{name}-cvslockd.init
 Source3:	%{name}.pam
@@ -29,16 +36,18 @@ Patch0:		%{name}-system-ltdl.patch
 Patch1:		%{name}-system-pcre.patch
 Patch2:		%{name}-system-zlib.patch
 Patch3:		%{name}-system-ntlm.patch
+Patch4:		%{name}-crypt.patch
+Patch5:		%{name}-build.patch
 URL:		http://www.cvsnt.org/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1:1.7.9
 BuildRequires:	docbook-style-xsl
-BuildRequires:	expat-devel
 BuildRequires:	howl-devel
 %{?with_kerberos:BuildRequires:	krb5-devel}
 BuildRequires:	libltdl-devel
 BuildRequires:	libntlm-devel >= 0.3.6
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	mysql-devel
 BuildRequires:	openssl-devel
@@ -50,6 +59,7 @@ BuildRequires:	sqlite3-devel
 BuildRequires:	unixODBC-devel
 BuildRequires:	xmlto
 BuildRequires:	zlib-devel
+Requires(post):	/sbin/ldconfig
 Provides:	cvs-client = %{version}
 Obsoletes:	cvs-client
 Obsoletes:	cvs-nserver-client
@@ -159,6 +169,14 @@ Requires:	%{name} = %{version}-%{release}
 %description protocol-sserver
 sserver (SSL) protocol support for CVSNT.
 
+%package protocol-sspi
+Summary:	SSPI procotol support for for CVSNT
+Group:		Development/Version Control
+Requires:	%{name} = %{version}-%{release}
+
+%description protocol-sspi
+SSPI protocol support for CVSNT.
+
 %package protocol-sync
 Summary:	sync procotol support for for CVSNT
 Group:		Development/Version Control
@@ -182,6 +200,8 @@ CVSNT version of RCS tools.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p0
+%patch5 -p1
 
 rm -rf pcre libltdl zlib protocols/ntlm
 
@@ -240,8 +260,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 if [ "$1" = "0" ]; then
-        %service cvslockd stop
-        /sbin/chkconfig --del cvslockd
+	%service cvslockd stop
+	/sbin/chkconfig --del cvslockd
 fi
 
 %postun -p /sbin/ldconfig
@@ -288,12 +308,10 @@ fi
 %attr(755,root,root) %{_libdir}/cvsnt/protocols/ext.so
 %attr(755,root,root) %{_libdir}/cvsnt/protocols/pserver.so
 %attr(755,root,root) %{_libdir}/cvsnt/protocols/server.so
-%attr(755,root,root) %{_libdir}/cvsnt/protocols/sspi.so
 %{_libdir}/cvsnt/protocols/enum.la
 %{_libdir}/cvsnt/protocols/ext.la
 %{_libdir}/cvsnt/protocols/pserver.la
 %{_libdir}/cvsnt/protocols/server.la
-%{_libdir}/cvsnt/protocols/sspi.la
 %dir %{_libdir}/cvsnt/triggers
 %attr(755,root,root) %{_libdir}/cvsnt/triggers/*.so
 %{_libdir}/cvsnt/triggers/*.la
@@ -346,6 +364,11 @@ fi
 %attr(755,root,root) %{_libdir}/cvsnt/protocols/sserver.so
 %{_libdir}/cvsnt/protocols/sserver.la
 
+%files protocol-sspi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/cvsnt/protocols/sspi.so
+%{_libdir}/cvsnt/protocols/sspi.la
+
 %files protocol-sync
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/cvsnt/protocols/sync.so