preparing for release of 2.5.6

diff --git a/configure.in b/configure.in
index 6b19c9f183ab844d22098ce1b024160445ca0dd5..e5bafdc7ae7cb190c0637ba09fd5ea1f65be1c5e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.52)
 
-RSYNC_VERSION=2.5.6pre3cvs
+RSYNC_VERSION=2.5.6
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 

diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index a1f64e28bea5e87182554e9de84596ccad4dfc02..0e6b66a93c5004efaab3e4a65c6949fffc807e76 100644 (file)
--- a/packaging/lsb/rsync.spec
+++ b/packaging/lsb/rsync.spec
@@ -1,10 +1,10 @@
 Summary: Program for efficient remote updates of files.
 Name: rsync
-Version: 2.5.1
+Version: 2.5.6
 Release: 1
 Copyright: GPL
 Group: Applications/Networking
-Source:        ftp://samba.anu.edu.au/pub/rsync/rsync-2.5.1.tar.gz
+Source:        ftp://samba.anu.edu.au/pub/rsync/rsync-2.5.6.tar.gz
 URL: http://samba.anu.edu.au/rsync/
 Packager: Andrew Tridgell <tridge@samba.anu.edu.au>
 BuildRoot: /tmp/rsync

diff --git a/packaging/redhat/5.0/rsync.spec b/packaging/redhat/5.0/rsync.spec
index 1fc42fd2a7949c3125d2e3b36794d950a3663981..bbc54881fa52aafdbe900ee4b20caa2db863273a 100644 (file)
--- a/packaging/redhat/5.0/rsync.spec
+++ b/packaging/redhat/5.0/rsync.spec
@@ -1,10 +1,10 @@
 Summary: Program for efficient remote updates of files.
 Name: rsync
-Version: 2.5.1
+Version: 2.5.6
 Release: 1
 Copyright: GPL
 Group: Applications/Networking
-Source:        ftp://samba.anu.edu.au/pub/rsync/rsync-2.5.1.tar.gz
+Source:        ftp://samba.anu.edu.au/pub/rsync/rsync-2.5.6.tar.gz
 URL: http://samba.anu.edu.au/rsync/
 Packager: Andrew Tridgell <tridge@samba.anu.edu.au>
 BuildRoot: /tmp/rsync

diff --git a/packaging/redhat/7.1/rsync.spec b/packaging/redhat/7.1/rsync.spec
index 745d51cae07f1c4c4b235315084ca1113929b356..0974cde50512c0b9309dc0975c7bbef312ef8577 100644 (file)
--- a/packaging/redhat/7.1/rsync.spec
+++ b/packaging/redhat/7.1/rsync.spec
@@ -1,10 +1,10 @@
 Summary: Program for efficient remote updates of files.
 Name: rsync
-Version: 2.5.4
+Version: 2.5.6
 Release: 1
 Copyright: GPL
 Group: Applications/Networking
-Source:        ftp://samba.anu.edu.au/pub/rsync/rsync-%{version}.tar.gz
+Source:        ftp://samba.anu.edu.au/pub/rsync/rsync-2.5.6.tar.gz
 URL: http://samba.anu.edu.au/rsync/
 Packager: Andrew Tridgell <tridge@samba.anu.edu.au>
 BuildRoot: /tmp/rsync
@@ -21,9 +21,6 @@ A technical report describing the rsync algorithm is included with
 this package. 
 
 %changelog
-* 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>
@@ -62,23 +59,23 @@ previous package(s).)
 %setup
 
 %build
-./configure --prefix=/usr --mandir=/usr/share/man
+./configure --prefix=/usr
 make CFLAGS="$RPM_OPT_FLAGS"
 strip rsync
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/{man1,man5}}
+mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/{man1,man5}}
 install -m755 rsync $RPM_BUILD_ROOT/usr/bin
-install -m644 rsync.1 $RPM_BUILD_ROOT/usr/share/man/man1
-install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/usr/share/man/man5
+install -m644 rsync.1* $RPM_BUILD_ROOT/usr/man/man1
+install -m644 rsyncd.conf.5* $RPM_BUILD_ROOT/usr/man/man5
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %attr(-,root,root) /usr/bin/rsync
-%attr(-,root,root) /usr/share/man/man1/rsync.1*
-%attr(-,root,root) /usr/share/man/man5/rsyncd.conf.5*
+%attr(-,root,root) /usr/man/man1/rsync.1*
+%attr(-,root,root) /usr/man/man5/rsyncd.conf.5*
 %attr(-,root,root) %doc tech_report.tex
 %attr(-,root,root) %doc README
 %attr(-,root,root) %doc COPYING