- added dblshutdown patch (fix for double server shutdown from cvs 1.11.3)

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

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index ba2efb67ffecda036935a73c3f420f371ce765ab..3bdbacbed4f3ce95329b79fd747efe05ad14415b 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -9,10 +9,10 @@ Summary(pl):  Concurrent Versions System - nserver
 Summary(tr):   Sürüm denetim sistemi - nserver
 Name:          cvs-nserver
 Version:       1.11.1.52
-Release:       15
+Release:       16
 License:       GPL
 Group:         Development/Version Control
-Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/cvs-nserver/%{name}-%{version}.tar.gz
 # Source0-md5: 357fb5f37cc556977dad79175e9c2d97
 Source1:       %{name}.inetd
 Source2:       cvs-pserver.inetd
@@ -34,6 +34,7 @@ Patch14:      %{name}-CAN-2003-0977-and-CAN-2004-0180.patch
 Patch15:       %{name}-CAN-2004-0396.patch
 Patch16:       %{name}-CAN-2004-0414.patch
 Patch17:       %{name}-CAN-2004-0416-0417-0418.patch
+Patch18:       %{name}-dblshutdown.patch
 URL:           http://cvs-nserver.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -192,6 +193,7 @@ Serwer CVS - pliki nservera.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 %{__aclocal}
@@ -262,26 +264,26 @@ rm -rf $RPM_BUILD_ROOT
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %pre common
-if [ -n "`getgid cvs`" ]; then
-       if [ "`getgid cvs`" != "52" ]; then
+if [ -n "`/usr/bin/getgid cvs`" ]; then
+       if [ "`/usr/bin/getgid cvs`" != "52" ]; then
                echo "Error: group cvs doesn't have gid=52. Correct this before installing cvs-nserver." 1>&2
                exit 1
        fi
 else
        echo "Adding group cvs GID=52."
-       /usr/sbin/groupadd -g 52 -r -f cvs
+       /usr/sbin/groupadd -g 52 -r cvs
 fi
-if [ -n "`getgid cvsadmin`" ]; then
-       if [ "`getgid cvsadmin`" != "53" ]; then
+if [ -n "`/usr/bin/getgid cvsadmin`" ]; then
+       if [ "`/usr/bin/getgid cvsadmin`" != "53" ]; then
                echo "Error: group cvsadmin doesn't have gid=53. Correct this before installing cvs-nserver." 1>&2
                exit 1
        fi
 else
        echo "Adding group cvsadmin GID=53."
-       /usr/sbin/groupadd -g 53 -r -f cvsadmin
+       /usr/sbin/groupadd -g 53 -r cvsadmin
 fi
-if [ -n "`id -u cvs 2>/dev/null`" ]; then
-       if [ "`id -u cvs`" != "52" ]; then
+if [ -n "`/bin/id -u cvs 2>/dev/null`" ]; then
+       if [ "`/bin/id -u cvs`" != "52" ]; then
                echo "Error: user cvs doesn't have uid=52. Correct this before installing cvs-nserver." 1>&2
                exit 1
        fi