- use %useradd/%groupadd macros

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

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index ad8a2b7650c700b68d79b1503435d60fa356e480..bc0d0c2a6f7de98680bcd252ff937ddbcbfbf4da 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:       14
+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,11 +34,12 @@ 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
 BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: texinfo
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -90,7 +91,7 @@ t
 mo¿liwo¶ci rcs'a z narzêdzia do kontroli zbioru plików w pojedynczym
 katalogu o mo¿liwo¶æ kontroli zbioru hierarchicznie u³o¿onych
 katalogów z plikami. Z pomoc± CVS w ³atwy sposób mo¿na zarz±dzaæ kodem
-¼ród³owym opracowywanym przez nawet bardzo du¿e zespó³y programistów
+¼ród³owym opracowywanym przez nawet bardzo du¿e zespo³y programistów
 umo¿liwiaj±c ¶ledzenie i kontrolê wszystkich zmian w trakcie pracy nad
 projektami i wypuszczaniem pe³nych wersji oprogramowania (release).
 
@@ -192,6 +193,7 @@ Serwer CVS - pliki nservera.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 %{__aclocal}
@@ -262,42 +264,11 @@ 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
-               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
-fi
-if [ -n "`getgid cvsadmin`" ]; then
-       if [ "`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
-fi
-if [ -n "`id -u cvs 2>/dev/null`" ]; then
-       if [ "`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
-else
-       echo "Adding user cvs UID=52."
-       /usr/sbin/useradd -u 52 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvs cvs 1>&2
-fi
-if [ -n "`id -u cvsadmin 2>/dev/null`" ]; then
-       if [ "`id -u cvsadmin`" != "53" ]; then
-               echo "Error: user cvsadmin doesn't have uid=53. Correct this before installing cvs-nserver." 1>&2
-               exit 1
-       fi
-else
-       echo "Adding user cvsadmin UID=53."
-       /usr/sbin/useradd -u 53 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvsadmin -G cvs cvsadmin 1>&2
-fi
+%groupadd -P %{name}-common -g 52 -r cvs
+%groupadd -P %{name}-common -g 53 -r cvsadmin
+%useradd -P %{name}-common -u 52 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvs cvs
+%useradd -P %{name}-common -u 53 -r -d %{_cvsroot} -s /bin/false -c "CVS user" -g cvsadmin -G cvs cvsadmin
+
 if [ "$1" = 1 ]; then
        echo "Initializing repository..."
        %{_bindir}/cvs -d :local:%{_cvsroot} init