- release 4: fixed info patch and typos in spec

Changed files:
    cvs-info.patch -> 1.4
    cvs.spec -> 1.66

diff --git a/cvs-info.patch b/cvs-info.patch
index 604062d36160911a7b9a2409e993b73d875612d1..cbda45b53c0359dd9dcc4f334499073861ab705e 100644 (file)
--- a/cvs-info.patch
+++ b/cvs-info.patch
@@ -1,6 +1,6 @@
-diff -Nru cvs-1.10.4/doc/cvs.texinfo cvs-1.10.4.new/doc/cvs.texinfo
---- cvs-1.10.4/doc/cvs.texinfo Thu Dec  3 02:16:10 1998
-+++ cvs-1.10.4.new/doc/cvs.texinfo     Mon Feb  1 01:29:53 1999
+diff -Nur cvs-1.11.1p1.orig/doc/cvs.texinfo cvs-1.11.1p1/doc/cvs.texinfo
+--- cvs-1.11.1p1.orig/doc/cvs.texinfo  Tue Apr 24 20:14:52 2001
++++ cvs-1.11.1p1/doc/cvs.texinfo       Sat Aug  4 18:40:13 2001
 @@ -49,9 +49,10 @@
  
  @ifinfo
@@ -15,22 +15,18 @@ diff -Nru cvs-1.10.4/doc/cvs.texinfo cvs-1.10.4.new/doc/cvs.texinfo
  @end format
  @end ifinfo
  
-diff -Nru cvs-1.10.4/doc/cvsclient.texi cvs-1.10.4.new/doc/cvsclient.texi
---- cvs-1.10.4/doc/cvsclient.texi      Thu Oct 15 16:36:38 1998
-+++ cvs-1.10.4.new/doc/cvsclient.texi  Mon Feb  1 01:32:08 1999
-@@ -3,6 +3,15 @@
+diff -Nur cvs-1.11.1p1.orig/doc/cvsclient.texi cvs-1.11.1p1/doc/cvsclient.texi
+--- cvs-1.11.1p1.orig/doc/cvsclient.texi       Tue Apr 24 20:14:52 2001
++++ cvs-1.11.1p1/doc/cvsclient.texi    Sat Aug  4 18:46:45 2001
+@@ -3,9 +3,9 @@
  @setfilename cvsclient.info
  @include CVSvn.texi
  
-+@ifinfo
-+@format
+-@dircategory Programming
 +@dircategory Version Control:
-+@direntry
+ @direntry
+-* cvsclient: (cvsclient).      The CVS client/server protocol.
 +* cvsclient: (cvsclient).             The CVS client/server protocol
-+@end direntry
-+@end format
-+@end ifinfo
-+
- @node Top
- @top CVS Client/Server
+ @end direntry
  
+ @node Top

diff --git a/cvs.spec b/cvs.spec
index 9d9075ae09542c02765b86a2693be75837e3f3f3..a96fa3314f06760276ddd8ee9a5a2798d3ac9fe2 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -5,7 +5,7 @@ Summary(pl):    Concurrent Versioning System
 Summary(tr):   Sürüm denetim sistemi
 Name:          cvs
 Version:       1.11.1p1
-Release:       3
+Release:       4
 License:       GPL
 Group:         Development/Version Control
 Group(de):     Entwicklung/Versionkontrolle
@@ -19,6 +19,7 @@ Patch3:               %{name}-zlib.patch
 Patch4:                %{name}-no_new_am.patch
 URL:           http://www.cyclic.com/
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -68,9 +69,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).
 
@@ -129,7 +130,7 @@ install -d $RPM_BUILD_ROOT/{etc/sysconfig/rc-inetd,home/cvsroot}
 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}
+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}