This commit was manufactured by cvs2git to create tag 'cvs-1_11_8-2'.

Sprout from master 2003-10-10 22:23:46 UTC Jakub Bogusz <qboosh@pld-linux.org> '- grrr, info patch is back (updated)'
Cherrypick from unlabeled-1.111.2 2003-12-06 19:05:18 UTC Jakub Bogusz <qboosh@pld-linux.org> '- cvsroot back to Ra-compatible (fixes BTS#783)':
    cvs.spec -> 1.111.2.1
Cherrypick from unlabeled-1.5.2 2003-01-23 15:39:01 UTC Tomek Orzechowski <orzech@pld-linux.org> '- back to /home/cvsroot':
    cvs.inetd -> 1.5.2.1
Delete:
    cvs-DESTDIR.patch
    cvs-hash-in-Makefile.am.patch
    cvs-timestamp.patch
    cvs-tmprace.patch

diff --git a/cvs-DESTDIR.patch b/cvs-DESTDIR.patch
deleted file mode 100644 (file)
index a8c9ff6..0000000
--- a/cvs-DESTDIR.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Nru cvs-1.11/contrib/Makefile.in cvs-1.11.new/contrib/Makefile.in
---- cvs-1.11/contrib/Makefile.in       Fri Sep  8 20:28:02 2000
-+++ cvs-1.11.new/contrib/Makefile.in   Thu Sep 21 23:21:55 2000
-@@ -80,18 +80,18 @@
- 
- install: all installdirs
-       for f in $(CONTRIB_FILES) ; do\
--              $(INSTALL_DATA) $(srcdir)/$$f $(libdir)/cvs/contrib/$$f; \
-+              $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(libdir)/cvs/contrib/$$f; \
-       done
-       for f in $(CONTRIB_PROGS) ; do\
--              $(INSTALL_PROGRAM) $$f $(libdir)/cvs/contrib/$$f; \
-+              $(INSTALL_PROGRAM) $$f $(DESTDIR)$(libdir)/cvs/contrib/$$f; \
-       done
-       for f in $(PROGS) ; do\
--              $(INSTALL_PROGRAM) $$f $(bindir)/$$f; \
-+              $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f; \
-       done
- .PHONY: install
- 
- installdirs:
--      $(top_srcdir)/mkinstalldirs $(libdir)/cvs/contrib
-+      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/cvs/contrib
- .PHONY: installdirs
- 
- tags:
-diff -Nru cvs-1.11/doc/Makefile.in cvs-1.11.new/doc/Makefile.in
---- cvs-1.11/doc/Makefile.in   Fri Sep  8 20:28:02 2000
-+++ cvs-1.11.new/doc/Makefile.in       Thu Sep 21 23:22:42 2000
-@@ -99,11 +99,11 @@
- install-info: info installdirs
-       if test -f cvs.info ; then docdir=.; else docdir=$(srcdir);fi; \
-       for i in $$docdir/*.info* ; do \
--        $(INSTALL_DATA) $$i $(infodir)/`basename $$i` ; \
-+        $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/`basename $$i` ; \
-       done
- 
- installdirs: 
--      $(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
-+      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
- .PHONY: installdirs
- 
- dvi: cvs.dvi cvsclient.dvi
-diff -Nru cvs-1.11/man/Makefile.in cvs-1.11.new/man/Makefile.in
---- cvs-1.11/man/Makefile.in   Fri Sep  8 20:28:02 2000
-+++ cvs-1.11.new/man/Makefile.in       Thu Sep 21 23:23:45 2000
-@@ -39,17 +39,17 @@
- # install will not fail if $(prefix)/man/man5 does not yet exist.
- install: all installdirs
-       for f in $(MAN1FILES); do \
--              $(INSTALL_DATA) $(srcdir)/$$f $(man1dir)/$$f; \
-+              $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(man1dir)/$$f; \
-       done
-       for f in $(MAN5FILES); do \
--              $(INSTALL_DATA) $(srcdir)/$$f $(man5dir)/$$f; \
-+              $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(man5dir)/$$f; \
-       done
-       for f in $(MAN8FILES); do \
--              $(INSTALL_DATA) $(srcdir)/$$f $(man8dir)/$$f; \
-+              $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(man8dir)/$$f; \
-       done
- 
- installdirs:
--      $(SHELL) $(top_srcdir)/mkinstalldirs $(man1dir) $(man5dir) $(man8dir)
-+      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir)
- 
- .PHONY: install installdirs
- 
-diff -Nru cvs-1.11/src/Makefile.in cvs-1.11.new/src/Makefile.in
---- cvs-1.11/src/Makefile.in   Thu Sep 21 23:24:42 2000
-+++ cvs-1.11.new/src/Makefile.in       Thu Sep 21 23:24:04 2000
-@@ -87,12 +87,12 @@
- 
- install: installdirs
-       @for prog in $(PROGS); do \
--        echo Installing $$prog in $(bindir); \
--        $(INSTALL) $$prog $(bindir)/$$prog ; \
-+        echo Installing $$prog in $(DESTDIR)$(bindir); \
-+        $(INSTALL) $$prog $(DESTDIR)$(bindir)/$$prog ; \
-       done
- 
- installdirs:
--      $(SHELL) $(top_srcdir)/mkinstalldirs $(bindir)
-+      $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 
- .PHONY: install installdirs
- 

diff --git a/cvs-hash-in-Makefile.am.patch b/cvs-hash-in-Makefile.am.patch
deleted file mode 100644 (file)
index 7aebe83..0000000
--- a/cvs-hash-in-Makefile.am.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- cvs-1.11.1p1/contrib/Makefile.am.comment   Thu Aug 30 17:44:49 2001
-+++ cvs-1.11.1p1/contrib/Makefile.am   Thu Aug 30 17:45:39 2001
-@@ -71,9 +71,9 @@
- CLEANFILES = $(bin_SCRIPTS) $(contrib_SCRIPTS)
- 
- # we'd rather have a link here rather than two copies of a script
-+# FIXME - this path should be determined dynamically from bindir
-+# & contribdir
- install-data-local:
--      # FIXME - this path should be determined dynamically from bindir
--      # & contribdir
-       @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(bindir)
-       @list='$(bin_LINKS)'; for p in $$list; do \
---- cvs-1.11.1p1/doc/Makefile.am.comment       Thu Aug 30 17:43:38 2001
-+++ cvs-1.11.1p1/doc/Makefile.am       Thu Aug 30 17:44:19 2001
-@@ -143,8 +143,8 @@
- #   don't look through VPATH for targets, but only for sources.
- # - They should be disabled on systems without the bug and in environments
- #   where $(srcdir) = $(builddir)
-+# use cat so the time stamp gets set properly
- CVSvn.texi: $(srcdir)/CVSvn.texi
--      # use cat so the time stamp gets set properly
-       cat $(srcdir)/CVSvn.texi >$@
- $(srcdir)/CVSvn.texi: $(srcdir)/CVSvn.texi.in $(top_srcdir)/configure.in
-       sed 's,@VERSION\@,$(VERSION),g' $(srcdir)/CVSvn.texi.in >$(srcdir)/CVSvn.ttexi

diff --git a/cvs-timestamp.patch b/cvs-timestamp.patch
deleted file mode 100644 (file)
index 759125a..0000000
--- a/cvs-timestamp.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/vers_ts.c~     Sun Oct  4 02:01:40 1998
-+++ src/vers_ts.c      Mon Jan  8 12:00:57 2001
-@@ -340,13 +340,22 @@
- {
-     struct stat sb;
-     char *cp;
--    char *ts;
-+    char *ts = NULL;
-+    time_t mtime = 0L;
- 
--    if (CVS_LSTAT (file, &sb) < 0)
-+    if (!CVS_LSTAT (file, &sb))
-     {
--      ts = NULL;
-+      mtime = sb.st_mtime;
-     }
--    else
-+    /* If it's a symlink, return whichever is the newest mtime of
-+       the link and its target, for safety.
-+    */
-+    if (!CVS_STAT (file, &sb))
-+    {
-+        if (mtime < sb.st_mtime)
-+          mtime = sb.st_mtime;
-+    }
-+    if (mtime)
-     {
-       struct tm *tm_p;
-         struct tm local_tm;

diff --git a/cvs-tmprace.patch b/cvs-tmprace.patch
deleted file mode 100644 (file)
index 670d66d..0000000
--- a/cvs-tmprace.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- cvs-1.10/src/cvsbug.in.jbj Mon Aug 31 13:43:39 1998
-+++ cvs-1.10/src/cvsbug.in     Mon Aug 31 14:02:41 1998
-@@ -85,9 +85,9 @@
- 
- [ -z "$TMPDIR" ] && TMPDIR=/tmp
- 
--TEMP=$TMPDIR/p$$
--BAD=$TMPDIR/pbad$$
--REF=$TMPDIR/pf$$
-+TEMP="/bin/mktemp $TMPDIR/p.XXXXXX"
-+BAD="/bin/mktemp $TMPDIR/pbad.XXXXXX"
-+REF="/bin/mktemp $TMPDIR/pf.XXXXXX"
- 
- if [ -z "$LOGNAME" -a -n "$USER" ]; then
-   LOGNAME=$USER

diff --git a/cvs.inetd b/cvs.inetd
index 46b26971dc31becdbb3175981c7c265511339f35..4baa0cc0213c7b20f95a4465fa6f6463829b36f6 100644 (file)
--- a/cvs.inetd
+++ b/cvs.inetd
@@ -7,4 +7,4 @@ USER=cvs
 GROUP=cvs
 SERVER=tcpd
 DAEMON=/usr/bin/cvs
-DAEMONARGS="-f --allow-root=/home/services/cvsroot pserver"
+DAEMONARGS="-f --allow-root=/home/cvsroot pserver"

diff --git a/cvs.spec b/cvs.spec
index bd97f34311b9ff9538ca201f7d2292ca66a6e5b2..e248396cc858b790786e29ae2055ef4bea1d6348 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -10,7 +10,7 @@ Summary(uk):  
 Summary(zh_CN):        ²¢·¢µÄ°æ±¾¹ÜÀíϵͳCVS
 Name:          cvs
 Version:       1.11.8
-Release:       1
+Release:       2
 License:       GPL
 Group:         Development/Version Control
 # new feature release: http://ftp.cvshome.org/release/feature/cvs-1.12.1/cvs-1.12.1.tar.bz2
@@ -27,13 +27,13 @@ Patch5:             %{name}-newnline.patch
 Patch6:                %{name}-no_libnsl.patch
 Patch7:                %{name}-info.patch
 URL:           http://www.cyclic.com/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.57
 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/cvsroot
 
 %description
 CVS means Concurrent Version System; it is a version control system