diff --git a/rsync-3.0.5-doc-fix.patch b/rsync-3.0.5-doc-fix.patch new file mode 100644 index 0000000..6e7ba04 --- /dev/null +++ b/rsync-3.0.5-doc-fix.patch @@ -0,0 +1,15 @@ +Index: rsync-3.0.5/rsync.1 +=================================================================== +--- rsync-3.0.5.orig/rsync.1 2008-12-29 03:03:37.000000000 +0100 ++++ rsync-3.0.5/rsync.1 2009-03-24 11:12:00.000000000 +0100 +@@ -442,8 +442,8 @@ + \-\-remove\-source\-files sender removes synchronized files (non-dir) + \-\-del an alias for \-\-delete\-during + \-\-delete delete extraneous files from dest dirs +- \-\-delete\-before receiver deletes before transfer (default) +- \-\-delete\-during receiver deletes during xfer, not before ++ \-\-delete\-before receiver deletes before xfer, not during ++ \-\-delete\-during receiver deletes during transfer (default) + \-\-delete\-delay find deletions during, delete after + \-\-delete\-after receiver deletes after transfer, not before + \-\-delete\-excluded also delete excluded files from dest dirs diff --git a/rsync.changes b/rsync.changes index 71e5b0b..43e2a82 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 24 11:16:57 CET 2009 - puzel@suse.cz + +- add rsync-3.0.5-doc-fix.patch (bnc#487591) + ------------------------------------------------------------------- Thu Feb 19 14:34:05 CET 2009 - puzel@suse.cz diff --git a/rsync.spec b/rsync.spec index 994cbf5..292295f 100644 --- a/rsync.spec +++ b/rsync.spec @@ -32,7 +32,7 @@ Group: Productivity/Networking/Other PreReq: %fillup_prereq %insserv_prereq sed grep AutoReqProv: on Version: 3.0.5 -Release: 1 +Release: 2 Summary: Replacement for RCP/mirror that has Many More Features Source: %{name}-%{version}.tar.bz2 Source1: %{name}-patches-%{version}.tar.bz2 @@ -43,6 +43,8 @@ Source5: rsyncd.conf Source6: rsyncd.secrets Source7: rsync-server.firewall Patch3: system-zlib.diff +#PATCH-FIX-UPSTREAM rsync-3.0.5-doc-fix.patch bnc487591 petr.uzel@suse.cz -- based on upstream changes to rsync.yo +Patch4: rsync-3.0.5-doc-fix.patch Url: http://rsync.samba.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define with_system_zlib 0 @@ -74,6 +76,7 @@ rm -f zlib/*.h patch -p1 < patches/acls.diff patch -p1 < patches/xattrs.diff patch -p1 < patches/slp.diff +%patch4 -p1 %build autoheader @@ -136,6 +139,8 @@ fi %doc COPYING NEWS README tech_report.ps tech_report.tex %changelog +* Tue Mar 24 2009 puzel@suse.cz +- add rsync-3.0.5-doc-fix.patch (bnc#487591) * Thu Feb 19 2009 puzel@suse.cz - update to 3.0.5 - initialize xattr data in a couple spots in the hlink code, which avoids a