- rel 1 for ac

[packages/cvs.git] / cvs.spec

diff --git a/cvs.spec b/cvs.spec
index 8feeb10be7d9edcfbd7ff99670979a56c0766a9d..457505b1ee1b9a3af3d62ca158ad8ebac8696947 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -9,29 +9,31 @@ Summary(tr):  S
 Summary(uk):   óÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ×ÅÒÓ¦ÑÍÉ
 Summary(zh_CN):        ²¢·¢µÄ°æ±¾¹ÜÀíϵͳCVS
 Name:          cvs
-Version:       1.11.4
-Release:       0.9
+Version:       1.11.6
+Release:       1
 License:       GPL
 Group:         Development/Version Control
-# active ftp only(?)
-Source0:       ftp://ftp.cvshome.org/pub/%{name}-%{version}/%{name}-%{version}.tar.bz2
+# new feature release: http://ftp.cvshome.org/release/feature/cvs-1.12.1/cvs-1.12.1.tar.bz2
+# Source0-md5: 06a5bbcd93a780a3bbec788deb1cf35b
+Source0:       http://ftp.cvshome.org/release/stable/%{name}-%{version}/%{name}-%{version}.tar.bz2
 Source1:       %{name}.inetd
-Patch0:                %{name}-tmprace.patch
-Patch1:                %{name}-info.patch
-Patch2:                http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/%{name}-1.11.2-20020513-ipv6.patch.gz
-Patch3:                %{name}-zlib.patch
-Patch4:                %{name}-fixed_buffer.patch
-Patch5:                %{name}-cvspass.patch
-Patch6:                %{name}-home_etc.patch
-Patch7:                %{name}-newnline.patch
-Patch8:                %{name}-no_libnsl.patch
+Patch0:                %{name}-info.patch
+# based on:    http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/cvs-1.11.2-20020513-ipv6.patch.gz
+Patch1:                %{name}-ipv6.patch
+Patch2:                %{name}-zlib.patch
+Patch3:                %{name}-fixed_buffer.patch
+Patch4:                %{name}-cvspass.patch
+Patch5:                %{name}-home_etc.patch
+Patch6:                %{name}-newnline.patch
+Patch7:                %{name}-no_libnsl.patch
 URL:           http://www.cyclic.com/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: zlib-devel
+Obsoletes:     cvs-nserver-client
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define _cvs_root /home/services/cvsroot
+%define                _cvs_root       /home/services/cvsroot
 
 %description
 CVS means Concurrent Version System; it is a version control system
@@ -151,7 +153,17 @@ Summary:   rc-inetd config files to run CVS pserver
 Summary(pl):   Pliki konfiguracyjne rc-ineta do postawienia pservera CVS
 Group:         Development/Version Control
 PreReq:                %{name} = %{version}
-Requires:      rc-inetd
+PreReq:                rc-inetd
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(post):        fileutils
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
+Obsoletes:     cvs-nserver-common
+Obsoletes:     cvs-nserver-nserver
+Obsoletes:     cvs-nserver-pserver
 
 %description pserver
 Config files for rc-inetd that are necessary to run CVS in pserver
@@ -171,7 +183,6 @@ pserver.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
 rm -f missing
@@ -181,7 +192,8 @@ rm -f missing
 %{__automake}
 %configure \
        --enable-server \
-       --enable-client
+       --enable-client \
+       --with-tmpdir=/tmp
 %{__make}
 
 %install
@@ -206,17 +218,28 @@ rm -rf $RPM_BUILD_ROOT
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %pre pserver
-if [ "$1" = 1 ]; then
-       # Add user and group
-       getgid cvs >/dev/null 2>&1 || %{_sbindir}/groupadd -f -g 52 cvs
-       id -u cvs >/dev/null 2>&1 || %{_sbindir}/useradd -g cvs -d %{_cvs_root} -u 52 -s /bin/false cvs 2>/dev/null
+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." 1>&2
+               exit 1
+       fi
+else
+       /usr/sbin/groupadd -f -g 52 cvs 1>&2
+fi
+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." 1>&2
+               exit 1
+       fi
+else
+       /usr/sbin/useradd -g cvs -d %{_cvs_root} -u 52 -s /bin/false cvs 1>&2
 fi
 
 %post pserver
-if [ "$1" = 1 ]; then
+if [ "$1" = "1" ]; then
        # Initialise repository
        %{_bindir}/cvs -d :local:%{_cvs_root} init
-       chown -R cvs.cvs %{_cvs_root}/CVSROOT
+       chown -R cvs:cvs %{_cvs_root}/CVSROOT
 fi
 if [ -f /var/lock/subsys/rc-inetd ]; then
        /etc/rc.d/init.d/rc-inetd reload
@@ -225,8 +248,8 @@ fi
 %postun pserver
 if [ "$1" = "0" ]; then
        # Remove user and group
-       %{_sbindir}/userdel cvs 2>/dev/null
-       %{_sbindir}/groupdel cvs 2>/dev/null
+       /usr/sbin/userdel cvs 2>/dev/null
+       /usr/sbin/groupdel cvs 2>/dev/null
        if [ -f /var/lock/subsys/rc-inetd ]; then
                /etc/rc.d/init.d/rc-inetd reload
        fi