Release 36 (by relup.sh)

[packages/cvs-nserver.git] / cvs-nserver.spec

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index 25d102f90fd07ef300eafef3604a5eb7a45d1b41..5386a417cfc9d2349c7974b35c9f59a84389be7a 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8):      Concurrent Versions System - nserver
 Summary(tr.UTF-8):     Sürüm denetim sistemi - nserver
 Name:          cvs-nserver
 Version:       1.11.1.52
-Release:       23
+Release:       36
 License:       GPL
 Group:         Development/Version Control
 Source0:       http://dl.sourceforge.net/cvs-nserver/%{name}-%{version}.tar.gz
@@ -37,10 +37,13 @@ Patch17:    %{name}-CAN-2004-0416-0417-0418.patch
 Patch18:       %{name}-dblshutdown.patch
 Patch19:       %{name}-krb5.patch
 Patch20:       %{name}-cvspasswd-mode.patch
+Patch21:       %{name}-getline.patch
+Patch22:       format-security.patch
+Patch23:       openssl.patch
 URL:           http://cvs-nserver.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: krb5-devel
+BuildRequires: heimdal-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: texinfo
@@ -113,6 +116,7 @@ Summary:    Concurrent Versions System - client
 Summary(pl.UTF-8):     Concurrent Versions System - klient
 Group:         Development/Version Control
 Provides:      cvs-client = %{version}
+Obsoletes:     cvs-client
 Obsoletes:     cvs-npclient
 Conflicts:     cvs
 
@@ -199,6 +203,9 @@ Serwer CVS - pliki nservera.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
 
 %build
 %{__aclocal}
@@ -211,13 +218,14 @@ Serwer CVS - pliki nservera.
        --enable-setuid \
        --with-openssl \
        --with-gssapi
-%{__make}
+
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/sysconfig/rc-inetd,%{_cvsroot},/var/lock/cvs}
 
-%{__make} install \
+%{__make} -j1 install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cvs-nserver
@@ -262,11 +270,11 @@ mv -f     $RPM_BUILD_ROOT%{_datadir}/cvs-nserver/contrib/rcs2log \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post client
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post client   -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun client
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun client -p      /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %pre common
 %groupadd -P %{name}-common -g 52 -r cvs