diff --git a/.cvsignore b/.cvsignore index 17e9f4b..1fd6e79 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ rdist-6.1.5.tar.gz +rdist-v1.tar.gz diff --git a/rdist-6.1.5-oldpath.patch b/rdist-6.1.5-oldpath.patch index 556e050..e30b78b 100644 --- a/rdist-6.1.5-oldpath.patch +++ b/rdist-6.1.5-oldpath.patch @@ -1,5 +1,5 @@ ---- rdist-6.1.5/config/config.h.oldpath Mon Nov 9 22:59:48 1998 -+++ rdist-6.1.5/config/config.h Tue Apr 13 15:09:55 1999 +--- rdist-6.1.5/config/config.h.oldpath Tue Nov 10 04:59:48 1998 ++++ rdist-6.1.5/config/config.h Thu Jan 31 17:33:21 2002 @@ -39,7 +39,7 @@ * don't have the old rdist, then uncomment the "#undef" line. */ @@ -9,8 +9,8 @@ #endif /*#undef _PATH_OLDRDIST*/ /* Disable compat */ ---- rdist-6.1.5/doc/rdist.man.oldpath Tue Apr 13 15:11:33 1999 -+++ rdist-6.1.5/doc/rdist.man Tue Apr 13 15:13:42 1999 +--- rdist-6.1.5/doc/rdist.man.oldpath Tue Nov 10 06:38:53 1998 ++++ rdist-6.1.5/doc/rdist.man Thu Jan 31 17:36:57 2002 @@ -170,10 +170,9 @@ This option will only work if .I rdist @@ -20,13 +20,22 @@ -or -.I /usr/old/rdist) +(the path -+.I/usr/bin/oldrdist ++.I /usr/bin/oldrdist +is used on Red Hat linux) and that program is available at run time. .PP .I Rdist ---- rdist-6.1.5/README.oldpath Tue Apr 13 15:14:07 1999 -+++ rdist-6.1.5/README Tue Apr 13 15:15:42 1999 +@@ -558,7 +557,7 @@ + should be of form + .sp + .RS +-\fIfacility\fB=\fItypes\fB:\fIfacility\fB=\fItypes... ++\fIfacility\fB=\fItypes\fB:\fIfacility\fB=\fItypes...\fR + .RE + .sp + The valid facility names are: +--- rdist-6.1.5/README.oldpath Fri Jul 19 19:24:09 1996 ++++ rdist-6.1.5/README Thu Jan 31 17:33:21 2002 @@ -65,12 +65,12 @@ The way the old rdist started a server rdist is to run "rdist diff --git a/rdist.spec b/rdist.spec index 4acc399..63205b6 100644 --- a/rdist.spec +++ b/rdist.spec @@ -1,18 +1,18 @@ Summary: Maintains identical copies of files on multiple machines. Name: rdist Version: 6.1.5 -Release: 16 +Release: 23 Epoch: 1 Copyright: BSD Group: Applications/System Source0: http://www.MagniComp.com/download/rdist/rdist-%{version}.tar.gz Source1: http://www.magnicomp.com/rdist/rdist-eu-license.txt +Source2: http://people.redhat.com/src/rdist-v1.tar.gz Patch0: rdist-6.1.5-linux.patch Patch1: rdist-6.1.5-links.patch Patch2: rdist-6.1.5-oldpath.patch Patch3: rdist-6.1.5-hardlink.patch URL: http://www.MagniComp.comA/rdist -ExcludeArch: ia64 BuildRoot: %{_tmppath}/%{name}-root %description @@ -25,6 +25,7 @@ multiple hosts. %prep %setup -q +%setup -q -T -D -a 2 cp %{SOURCE1} . @@ -35,6 +36,7 @@ cp %{SOURCE1} . %build make +make -C rdist %install rm -rf ${RPM_BUILD_ROOT} @@ -42,8 +44,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8} -install -s -m755 src/rdist ${RPM_BUILD_ROOT}%{_bindir} -install -s -m755 src/rdistd ${RPM_BUILD_ROOT}%{_sbindir} +install -m755 src/rdist ${RPM_BUILD_ROOT}%{_bindir} +install -m755 rdist/rdist ${RPM_BUILD_ROOT}%{_bindir}/oldrdist +install -m755 src/rdistd ${RPM_BUILD_ROOT}%{_sbindir} ln -sf ../sbin/rdistd ${RPM_BUILD_ROOT}%{_bindir}/rdistd install -m644 doc/rdist.man ${RPM_BUILD_ROOT}%{_mandir}/man1/rdist.1 @@ -56,12 +59,36 @@ rm -rf ${RPM_BUILD_ROOT} %defattr(-,root,root) %doc README rdist-eu-license.txt %{_bindir}/rdist +%{_bindir}/oldrdist %{_bindir}/rdistd %{_sbindir}/rdistd %{_mandir}/man1/rdist.1* %{_mandir}/man8/rdist.8* %changelog +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu Jun 20 2002 Phil Knirsch 6.1.5-22 +- Bumped release and rebuilt. + +* Thu Jun 20 2002 Phil Knirsch 6.1.5-21 +- Include ia64 again. + +* Wed Jun 19 2002 Phil Knirsch 6.1.5-20 +- Don't forcibly strip binaries + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Jan 31 2002 Phil Knirsch +- Added my 4.3BSD port of the v1 protocol rdist code and provide a oldrdist + binary (#55761 and several others). +- Fixed a small manpage problem (#55489) + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. diff --git a/sources b/sources index a3736a0..c1f3090 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 546779700af70aa5f9103e08782cdcac rdist-6.1.5.tar.gz +963362cd29026e908bc7aac3ad66a9dd rdist-v1.tar.gz