Restored changes accidentally backed out by Dave Dykstra in previous revision.

diff --git a/packaging/redhat/7.1/rsync.spec b/packaging/redhat/7.1/rsync.spec
index 0974cde..a79e2bd 100644 (file)
--- a/packaging/redhat/7.1/rsync.spec
+++ b/packaging/redhat/7.1/rsync.spec
@@ -21,6 +21,15 @@ A technical report describing the rsync algorithm is included with
 this package. 
 
 %changelog
+* Wed Jan 29 2003 Paul Green <paulg@samba.org>
+  Restored changes accidentally removed by David Dykstra.
+
+* Tue Jan 28 2003 David Dykstra <dwd@samba.org>
+  Bumped version number to 2.5.6.
+
+* Mon Sep 11 2000 John H Terpstra <jht@turbolinux.com>
+  Changed target paths to be Linux Standards Base compliant
+
 * Mon Jan 25 1999 Stefan Hornburg <racke@linuxia.de>
   quoted RPM_OPT_FLAGS for the sake of robustness  
 * Mon May 18 1998 Andrew Tridgell <tridge@samba.anu.edu.au>
@@ -59,23 +68,23 @@ previous package(s).)
 %setup
 
 %build
-./configure --prefix=/usr
+./configure --prefix=/usr --man-dir=/usr/share/man
 make CFLAGS="$RPM_OPT_FLAGS"
 strip rsync
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/{man1,man5}}
+mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/{man1,man5}}
 install -m755 rsync $RPM_BUILD_ROOT/usr/bin
-install -m644 rsync.1* $RPM_BUILD_ROOT/usr/man/man1
-install -m644 rsyncd.conf.5* $RPM_BUILD_ROOT/usr/man/man5
+install -m644 rsync.1* $RPM_BUILD_ROOT/usr/share/man/man1
+install -m644 rsyncd.conf.5* $RPM_BUILD_ROOT/usr/share/man/man5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %attr(-,root,root) /usr/bin/rsync
-%attr(-,root,root) /usr/man/man1/rsync.1*
-%attr(-,root,root) /usr/man/man5/rsyncd.conf.5*
+%attr(-,root,root) /usr/share/man/man1/rsync.1*
+%attr(-,root,root) /usr/share/man/man5/rsyncd.conf.5*
 %attr(-,root,root) %doc tech_report.tex
 %attr(-,root,root) %doc README
 %attr(-,root,root) %doc COPYING