- release 28

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

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index f6f9adbbc04fc9bcf4db52d72bef3e049964a822..a055bcfb4176bd8490f32ae83a658975a94dac42 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -1,14 +1,15 @@
 # TODO:
 # - trigger for upgrade from old cvs - after that package stays without any
 #   users and nserver-common is not installed...
+# - cvschkpw causes sig11 when run without CVSSERVER variable set.
 Summary:       Concurrent Versions System - nserver
-Summary(de.UTF-8):   Concurrent-Versioning-System - nserver
-Summary(fr.UTF-8):   Un système pour maintenir à jour des fichiers - nserver
-Summary(pl.UTF-8):   Concurrent Versions System - nserver
-Summary(tr.UTF-8):   Sürüm denetim sistemi - nserver
+Summary(de.UTF-8):     Concurrent-Versioning-System - nserver
+Summary(fr.UTF-8):     Un système pour maintenir à jour des fichiers - nserver
+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:       18
+Release:       28
 License:       GPL
 Group:         Development/Version Control
 Source0:       http://dl.sourceforge.net/cvs-nserver/%{name}-%{version}.tar.gz
@@ -34,9 +35,13 @@ Patch15:     %{name}-CAN-2004-0396.patch
 Patch16:       %{name}-CAN-2004-0414.patch
 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
 URL:           http://cvs-nserver.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: heimdal-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: texinfo
@@ -106,11 +111,12 @@ sağlar.
 
 %package client
 Summary:       Concurrent Versions System - client
-Summary(pl.UTF-8):   Concurrent Versions System - klient
+Summary(pl.UTF-8):     Concurrent Versions System - klient
 Group:         Development/Version Control
-Provides:      cvs = %{version}
-Obsoletes:     cvs
+Provides:      cvs-client = %{version}
+Obsoletes:     cvs-client
 Obsoletes:     cvs-npclient
+Conflicts:     cvs
 
 %description client
 CVS client.
@@ -120,7 +126,7 @@ Klient CVS.
 
 %package common
 Summary:       Concurrent Versions System - common files
-Summary(pl.UTF-8):   Concurrent Versions System - wspólne pliki
+Summary(pl.UTF-8):     Concurrent Versions System - wspólne pliki
 Group:         Development/Version Control
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -145,7 +151,7 @@ Wspólne pliki serwerów CVS.
 
 %package pserver
 Summary:       Concurrent Versions System - pserver
-Summary(pl.UTF-8):   Concurrent Versions System - pserver
+Summary(pl.UTF-8):     Concurrent Versions System - pserver
 Group:         Development/Version Control
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      rc-inetd
@@ -160,7 +166,7 @@ Serwer CVS - pliki pservera.
 
 %package nserver
 Summary:       Concurrent Versions System - nserver
-Summary(pl.UTF-8):   Concurrent Versions System - nserver
+Summary(pl.UTF-8):     Concurrent Versions System - nserver
 Group:         Development/Version Control
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      rc-inetd
@@ -193,6 +199,9 @@ Serwer CVS - pliki nservera.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %build
 %{__aclocal}
@@ -204,14 +213,15 @@ Serwer CVS - pliki nservera.
        --enable-server \
        --enable-setuid \
        --with-openssl \
-       --without-gssapi
-%{__make}
+       --with-gssapi
+
+%{__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
@@ -224,7 +234,7 @@ if [ -f /etc/sysconfig/cvs ]; then
        . /etc/sysconfig/cvs
 fi
 
-CVSPASSWD=%{_bindir}/cvspasswd \
+CVSPASSWD=%{_bindir}/cvspasswd CVSSERVER=pserver \
 exec %{_bindir}/cvs-pserver \$REPOSITORY -- \
 %{_bindir}/cvschkpw %{_bindir}/cvs pserver
 EOF
@@ -236,7 +246,7 @@ if [ -f /etc/sysconfig/cvs ]; then
        . /etc/sysconfig/cvs
 fi
 
-CVSPASSWD=%{_bindir}/cvspasswd \
+CVSPASSWD=%{_bindir}/cvspasswd CVSSERVER=nserver \
 exec %{_bindir}/cvs-nserver \$REPOSITORY -- \
 %{_bindir}/cvschkpw %{_bindir}/cvs nserver
 EOF
@@ -256,11 +266,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