- moved rc-inetd reloading to %post

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

diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index b63708a0f836ff77bf781b38b0dd4a68dc39e392..71f1f903e922592f8a6dfd79c94a7ad2477c21fe 100644 (file)
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -4,20 +4,21 @@ Summary(fr):  Un syst
 Summary(pl):   Concurrent Versions System - nserver
 Summary(tr):   Sürüm denetim sistemi - nserver
 Name:          cvs-nserver
-Version:       1.11.1.3
+Version:       1.11.1.4
 Release:       1
 License:       GPL
 Group:         Development/Version Control
-Group(de):     Entwicklung/Versionkontrolle
-Group(pl):     Programowanie/Zarz±dzanie wersjami
-Source0:       http://alexm.here.ru/cvs-nserver/download/%{name}-%{version}.tar.gz
+Source0:       http://unc.dl.sourceforge.net/sourceforge/cvs-nserver/%{name}-%{version}.tar.gz
 Source1:       %{name}.inetd
 Source2:       cvs-pserver.inetd
 Patch0:                %{name}-cvspasswd.patch
 Patch1:                %{name}-info.patch
 # outdated, but maybe will be needed for checkpasswd (outside programs):
 Patch3:                %{name}-PAM_fix.patch
+Patch4:                %{name}-am_ac.patch
+Patch5:                %{name}-zlib.patch
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: texinfo
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -86,21 +87,17 @@ sa
 Summary:       Concurrent Versions System - common
 Summary(pl):   Concurrent Versions System - wspólne
 Group:         Development/Version Control
-Group(de):     Entwicklung/Versionkontrolle
-Group(pl):     Programowanie/Zarz±dzanie wersjami
 
 %description -n cvs-nclient
 Client and some common files.
 
-%description -l pl -n cvs-nclient
+%description -n cvs-nclient -l pl
 Klient CVS i trochê wspólnych plików.
 
 %package -n cvs-npserver
 Summary:       Concurrent Versions System - pserver
 Summary(pl):   Concurrent Versions System - pserver
 Group:         Development/Version Control
-Group(de):     Entwicklung/Versionkontrolle
-Group(pl):     Programowanie/Zarz±dzanie wersjami
 Requires:      cvs-nserver-common
 Obsoletes:     cvs
 Obsoletes:     cvs-nserver
@@ -108,16 +105,20 @@ Obsoletes:        cvs-nserver
 %description -n cvs-npserver
 Server - pserver.
 
-%description -l pl -n cvs-npserver
+%description -n cvs-npserver -l pl
 Serwer - pserver.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
-autoconf
+aclocal
+%{__autoconf}
+automake -a -c
 %configure \
        --enable-encryption \
        --enable-client \
@@ -152,12 +153,12 @@ EOF
 mv -f  $RPM_BUILD_ROOT%{_datadir}/cvs-nserver/contrib/rcs2log \
        $RPM_BUILD_ROOT%{_bindir}
 
-gzip -9nf AUTHORS BUGS NEWS NEWS.nserver PROJECTS TODO
+gzip -9nf AUTHORS BUGS NEWS NEWS.nserver PROJECTS TODO FAQ FAQ.nserver
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%pre
 if [ -n "`getgid cvs`" ]; then
        if [ "`getgid cvs`" != "52" ]; then
                echo "Warning: group cvs haven't gid=52. Correct this before installing cvs-nserver" 1>&2
@@ -200,6 +201,8 @@ if [ "$1" = 1 ]; then
        %{_bindir}/cvs -d :local:%{_cvsroot} init
        chown -R cvsadmin.cvsadmin %{_cvsroot}/CVSROOT
 fi
+
+%post
 if [ -f /var/lock/subsys/rc-inetd ]; then
         /etc/rc.d/init.d/rc-inetd reload
 fi
@@ -243,7 +246,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cvs-nserver*
-%doc NEWS.nserver.gz
+%doc NEWS.nserver.gz FAQ.nserver.gz
 /etc/sysconfig/rc-inetd/cvs-nserver
 %attr(4754,cvsadmin,cvs) %{_bindir}/cvspasswd
 %attr(755,root,root) %{_bindir}/cvschkpw
@@ -255,7 +258,7 @@ fi
 
 %files -n cvs-nclient
 %defattr(644,root,root,755)
-%doc {AUTHORS,BUGS,NEW,PROJECTS,TODO}
+%doc {AUTHORS,BUGS,NEWS,PROJECTS,TODO,FAQ}.gz
 %attr(755,root,root) %{_bindir}/cvs
 %attr(755,root,root) %{_bindir}/cvsbug
 %{_infodir}/cvs*