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

diff --git a/cvsnt.spec b/cvsnt.spec
index 05323cc..a9ca5ba 100644
--- a/cvsnt.spec
+++ b/cvsnt.spec
@@ -10,7 +10,6 @@
 #    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:
 #   /usr/lib/libcvsapi.la
@@ -22,28 +21,29 @@
 Summary:	Concurrent Versioning System
 Summary(pl.UTF-8):	Concurrent Versioning System
 Name:		cvsnt
-Version:	2.5.04.3125
-Release:	2
+# http://www.cvsnt.org/archive/2.5_stable tell which version is stable
+Version:	2.5.05.3744
+Release:	9
 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:	b8aae9e50c3ef682a126a5d19c797558
+# Source0-md5:	64aa0fc627893cc66182023b936260da
 Source1:	%{name}.inetd
 Source2:	%{name}-cvslockd.init
 Source3:	%{name}.pam
-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
+Patch0:		%{name}-system-pcre.patch
+Patch1:		%{name}-system-ntlm.patch
+Patch2:		%{name}-build.patch
+Patch3:		%{name}-nospam.patch
+Patch4:		%{name}-fixes.patch
+Patch5:		%{name}-gcc4.patch
+Patch6:		format-security.patch
 URL:		http://www.cvsnt.org/
 BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake >= 1:1.7.9
 BuildRequires:	docbook-style-xsl
 BuildRequires:	howl-devel
-%{?with_kerberos:BuildRequires:	krb5-devel}
+%{?with_kerberos:BuildRequires:	heimdal-devel}
 BuildRequires:	libltdl-devel
 BuildRequires:	libntlm-devel >= 0.3.6
 BuildRequires:	libstdc++-devel
@@ -110,6 +110,7 @@ Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-cvslockd = %{version}-%{release}
 Requires:	rc-inetd
 Provides:	group(cvs)
 Provides:	user(cvs)
@@ -121,6 +122,13 @@ Obsoletes:	cvs-nserver-pserver
 Config files for rc-inetd that are necessary to run CVS in pserver
 mode.
 
+%package cvslockd
+Summary:	locking daemon
+Group:		Development/Version Control
+
+%description cvslockd
+CVS locking daemon.
+
 %package database-mysql
 Summary:	MySQL Database support for CVSNT
 Group:		Development/Version Control
@@ -200,10 +208,11 @@ CVSNT version of RCS tools.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
-rm -rf pcre libltdl zlib protocols/ntlm
+rm -r protocols/ntlm
 
 %build
 %{__libtoolize}
@@ -253,19 +262,19 @@ mv $RPM_BUILD_ROOT%{_sysconfdir}/cvsnt/Plugins{.example,}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post cvslockd
 /sbin/chkconfig --add cvslockd
 %service cvslockd restart
 
-%preun
+%preun cvslockd
 if [ "$1" = "0" ]; then
 	%service cvslockd stop
 	/sbin/chkconfig --del cvslockd
 fi
 
-%postun -p /sbin/ldconfig
-
 %pre pserver
 %groupadd -f -g 52 cvs
 %useradd -g cvs -d %{_cvs_root} -u 52 -s /bin/false cvs
@@ -288,14 +297,12 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc doc/html_cvsclient
-%doc AUTHORS FAQ README
+%doc AUTHORS README
 %doc triggers/examples/*.txt
 %dir %{_sysconfdir}/cvsnt
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/cvsnt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cvsnt/*
-%attr(754,root,root) /etc/rc.d/init.d/cvslockd
 %attr(755,root,root) %{_bindir}/cvs
-%attr(755,root,root) %{_bindir}/cvslockd
 %attr(755,root,root) %{_bindir}/cvsnt
 %attr(755,root,root) %{_bindir}/cvsscript
 %dir %{_libdir}/cvsnt
@@ -327,6 +334,11 @@ fi
 %attr(770,root,cvs) %dir %{_cvs_root}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/cvsnt
 
+%files cvslockd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cvslockd
+%attr(754,root,root) /etc/rc.d/init.d/cvslockd
+
 %files database-mysql
 %defattr(644,root,root,755)
 %doc triggers/sql/*_mysql.sql
@@ -369,10 +381,10 @@ fi
 %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
-%{_libdir}/cvsnt/protocols/sync.la
+#%files protocol-sync
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/cvsnt/protocols/sync.so
+#%{_libdir}/cvsnt/protocols/sync.la
 
 %files rcs
 %defattr(644,root,root,755)