- stift /home/cvsroot changed into macro %%{_cvs_root}

[packages/cvs.git] / cvs.spec

diff --git a/cvs.spec b/cvs.spec
index 91625d4fa73151cef338af6220bed041f657e387..723348380606d5dd9af962c05428041d36a49446 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -4,23 +4,28 @@ Summary(fr):  Un syst
 Summary(pl):   Concurrent Versioning System
 Summary(tr):   Sürüm denetim sistemi
 Name:          cvs
-Version:       1.10.8
-Release:       4
+Version:       1.11.1p1
+Release:       5
 License:       GPL
 Group:         Development/Version Control
-Group(pl):     Programowanie/Zarz±dzanie Wersjami
-Source0:       http://download.cyclic.com/pub/%{name}-%{version}/%{name}-%{version}.tar.gz
-Source1:       cvs.inetd
-Patch0:                cvs-tmprace.patch
-Patch1:                cvs-info.patch
-Patch2:                http://www.misiek.eu.org/ipv6/cvs-ipv6-220200.patch.gz
-Patch3:                cvs-auth.patch
-Patch4:                cvs-zlib.patch
+Group(de):     Entwicklung/Versionkontrolle
+Group(pl):     Programowanie/Zarz±dzanie wersjami
+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.1-20010427-ipv6.patch.gz
+Patch3:                %{name}-zlib.patch
+Patch4:                %{name}-no_new_am.patch
+Patch5:                %{name}-hash-in-Makefile.am.patch
 URL:           http://www.cyclic.com/
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define _cvs_root /home/cvsroot
+
 %description
 CVS means Concurrent Version System; it is a version control system
 which can record the history of your files (usually, but not always,
@@ -67,9 +72,9 @@ syst
 CVS jest nak³adk± na rcs (Revision Control System, czyli w wolnym
 t³umaczeniu system kontroli wersji zasobów), który rozszerza
 mo¿liwo¶ci rcs'a z narzêdzia do kontroli zbioru plików w pojedynczym
-katalogu o mo¿liwo¶æ kontroli zbioru hierarhicznie u³o¿onych katalogów
+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
+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).
 
@@ -87,7 +92,8 @@ sa
 Summary:       rc-inetd config files to run CVS pserver
 Summary(pl):   Pliki konfiguracyjne rc-ineta do postawienia pservera CVS
 Group:         Development/Version Control
-Group(pl):     Programowanie/Zarz±dzanie Wersjami
+Group(de):     Entwicklung/Versionkontrolle
+Group(pl):     Programowanie/Zarz±dzanie wersjami
 Requires:      rc-inetd
 Prereq:                cvs
 
@@ -106,32 +112,33 @@ pserver.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 autoheader
+aclocal
+automake
 autoconf
-LDFLAGS="-s"; export LDFLAGS
 %configure \
        --enable-server \
        --enable-client
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-       prefix=$RPM_BUILD_ROOT%{_prefix} \
-       bindir=$RPM_BUILD_ROOT%{_bindir} \
-       mandir=$RPM_BUILD_ROOT%{_mandir}
-make install-info \
-       prefix=$RPM_BUILD_ROOT%{_prefix} \
-       infodir=$RPM_BUILD_ROOT%{_infodir}
-
 install -d $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd
-install -d $RPM_BUILD_ROOT/home/cvsroot
+install -d $RPM_BUILD_ROOT%{_cvs_root}
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cvs
 
-gzip -9nf $RPM_BUILD_ROOT{%{_infodir}/cvs*,%{_mandir}/man{1,5,8}/*} \
-       doc/*.ps BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README ChangeLog
+rm -f contrib/{.cvsignore,Makefile*,*.pl,*.sh,*.csh}
+mv -f $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}
 
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
@@ -143,16 +150,17 @@ gzip -9nf $RPM_BUILD_ROOT{%{_infodir}/cvs*,%{_mandir}/man{1,5,8}/*} \
 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 /home/cvsroot -u 15 -s /bin/false cvs 2>/dev/null
-       
-       # Initialise repository
-       %{_bindir}/cvs -d :local:/home/cvsroot init 
-       chown -R cvs.cvs /home/cvsroot/CVSROOT
+       id -u cvs >/dev/null 2>&1 || %{_sbindir}/useradd -g cvs -m -d %{_cvs_root} -u 52 -s /bin/false cvs 2>/dev/null
 fi
 
 %post pserver
+if [ "$1" = 1 ]; then
+       # Initialise repository
+       %{_bindir}/cvs -d :local:%{_cvs_root} init 
+       chown -R cvs.cvs %{_cvs_root}/CVSROOT
+fi
 if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+       /etc/rc.d/init.d/rc-inetd reload
 fi
 
 %postun pserver
@@ -161,7 +169,7 @@ if [ "$1" = "0" ]; then
        %{_sbindir}/userdel cvs 2>/dev/null
        %{_sbindir}/groupdel cvs 2>/dev/null
        if [ -f /var/lock/subsys/rc-inetd ]; then
-               /etc/rc.d/init.d/rc-inetd restart
+               /etc/rc.d/init.d/rc-inetd reload
        fi
 fi
 
@@ -170,15 +178,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {BUGS,FAQ,MINOR-BUGS,NEWS,PROJECTS,TODO,README,ChangeLog}.gz
-%doc doc/*.ps.gz contrib/*
-
+%doc *.gz doc/*.ps.gz contrib
 %attr(755,root,root) %{_bindir}/*
-
 %{_mandir}/man[158]/*
 %{_infodir}/cvs*
 
 %files pserver
 %defattr(644,root,root,755)
-/etc/sysconfig/rc-inetd/cvs
-%attr(750,cvs,cvs) %dir /home/cvsroot
+%attr(770,root,cvs) %dir %{_cvs_root}
+%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rc-inetd/cvs