- release 3: realy install in proper way rcs2log.

[packages/cvs.git] / cvs.spec

diff --git a/cvs.spec b/cvs.spec
index 203f797025bbfaac6cbbe2842d24a04f3ed09f32..9d9075ae09542c02765b86a2693be75837e3f3f3 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -4,19 +4,19 @@ Summary(fr):  Un syst
 Summary(pl):   Concurrent Versioning System
 Summary(tr):   Sürüm denetim sistemi
 Name:          cvs
-Version:       1.11
+Version:       1.11.1p1
 Release:       3
 License:       GPL
 Group:         Development/Version Control
 Group(de):     Entwicklung/Versionkontrolle
 Group(pl):     Programowanie/Zarz±dzanie wersjami
-Source0:       ftp://ftp.cvshome.org/pub/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.cvshome.org/pub/%{name}-1.11.1/%{name}-%{version}.tar.gz
 Source1:       %{name}.inetd
 Patch0:                %{name}-tmprace.patch
 Patch1:                %{name}-info.patch
-Patch2:                http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/cvs-1.11-20001103-ipv6.patch.gz
+Patch2:                http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/cvs-1.11.1-20010427-ipv6.patch.gz
 Patch3:                %{name}-zlib.patch
-Patch4:                %{name}-DESTDIR.patch
+Patch4:                %{name}-no_new_am.patch
 URL:           http://www.cyclic.com/
 BuildRequires: autoconf
 BuildRequires: zlib-devel
@@ -111,6 +111,8 @@ pserver.
 
 %build
 autoheader
+aclocal
+automake
 autoconf
 %configure \
        --enable-server \
@@ -121,16 +123,17 @@ autoconf
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/{etc/sysconfig/rc-inetd,home/cvsroot}
 
-%{__make} install install-info \
+%{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cvs
 
+rm -f contrib/{.cvsignore,Makefile*,*.pl,*.sh,*.csh}
+mv $RPM_BUILD_ROOT%{_datadir}/cvs/contrib/rcs2log $RPM_BUILD_ROOT%{_bindir}
+
 gzip -9nf doc/*.ps BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README ChangeLog \
        contrib/{*.man,README,ChangeLog,intro.doc}
 
-rm -f contrib/{.cvsignore,Makefile*,*.pl,*.sh,*.csh}
-
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
@@ -141,7 +144,7 @@ rm -f contrib/{.cvsignore,Makefile*,*.pl,*.sh,*.csh}
 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 -M -d /home/cvsroot -u 52 -s /bin/false cvs 2>/dev/null
+       id -u cvs >/dev/null 2>&1 || %{_sbindir}/useradd -g cvs -m -d /home/cvsroot -u 52 -s /bin/false cvs 2>/dev/null
 fi
 
 %post pserver
@@ -169,11 +172,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc *.gz doc/*.ps.gz contrib
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man[158]/*
 %{_infodir}/cvs*
-%doc {BUGS,FAQ,MINOR-BUGS,NEWS,PROJECTS,TODO,README,ChangeLog}.gz
-%doc doc/*.ps.gz contrib
 
 %files pserver
 %defattr(644,root,root,755)