rpms/librsync/EL-4 librsync-0.9.7-getopt.patch, NONE, 1.1 librsync-0.9.7-man_pages.patch, NONE, 1.1 librsync.spec, 1.11, 1.12

[Robert Scheck]

Author: robert

Update of /cvs/extras/rpms/librsync/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10211/EL-4

Modified Files:
	librsync.spec 
Added Files:
	librsync-0.9.7-getopt.patch librsync-0.9.7-man_pages.patch 
Log Message:
- Run libtoolize before %configure to avoid libtool 2.2 errors
- Added a patch to make rdiff aware of -i and -z getopt options
- Updated man page for how to use rdiff and removed a dead link


librsync-0.9.7-getopt.patch:

--- NEW FILE librsync-0.9.7-getopt.patch ---
Patch by Daniel Baumann <daniel at debian.org> for librsync >= 0.9.7, which makes
rdiff aware of -i and -z getopt options mentioned in --help output. For further
information, please have a look to Debian bug ID #435894.

--- librsync-0.9.7/rdiff.c			2004-09-17 23:35:50.000000000 +0200
+++ librsync-0.9.7/rdiff.c.getopt		2008-12-20 13:45:58.000000000 +0100
@@ -97,8 +97,8 @@
     { "sum-size",    'S', POPT_ARG_INT,  &strong_len },
     { "statistics",  's', POPT_ARG_NONE, &show_stats },
     { "stats",        0,  POPT_ARG_NONE, &show_stats },
-    { "gzip",         0,  POPT_ARG_NONE, 0,             OPT_GZIP },
-    { "bzip2",        0,  POPT_ARG_NONE, 0,             OPT_BZIP2 },
+    { "gzip",        'z', POPT_ARG_NONE, 0,             OPT_GZIP },
+    { "bzip2",       'i', POPT_ARG_NONE, 0,             OPT_BZIP2 },
     { "paranoia",     0,  POPT_ARG_NONE, &rs_roll_paranoia },
     { 0 }
 };

librsync-0.9.7-man_pages.patch:

--- NEW FILE librsync-0.9.7-man_pages.patch ---
Patch by Daniel Baumann <daniel at debian.org> for librsync >= 0.9.7, which describes
how to use rdiff more verbosely. It updates the man page to remove long time dead
link to Linuxcare Australia as well. For further information, please have a look to
Debian bug IDs #228005, #156457 and #288758.

--- librsync-0.9.7/doc/rdiff.1			2004-02-08 00:17:57.000000000 +0100
+++ librsync-0.9.7/doc/rdiff.1.man_pages	2008-12-20 13:47:45.000000000 +0100
@@ -29,10 +29,17 @@
 .PP
 \fBrdiff\fP [\fIoptions\fP] \fBpatch\fP \fIbasis-file delta-file new-file\fP
 .fi
+.SH USAGE
+You can use \fBrdiff\fP to update files, much like \fBrsync\fP does.
+However, unlike \fBrsync\fP, \fBrdiff\fP puts you in control.  There
+are three steps to updating a file: \fBsignature\fP, \fBdelta\fP, and
+\fBpatch\fP.
 .SH DESCRIPTION
 In every case where a filename must be specified, \- may be used
 instead to mean either standard input or standard output as
-appropriate.
+appropriate.  Be aware that if you do this, you'll need to terminate your
+\fIoptions\fP with \-\- or \fBrdiff\fP will think you are passing it
+an empty option.
 .SH "RETURN VALUE"
 0 for successful completion, 1 for environmental problems (file not
 found, invalid options, IO error, etc), 2 for a corrupt file and 3 for
--- librsync-0.9.7/doc/librsync.3		2004-02-08 00:17:57.000000000 +0100
+++ librsync-0.9.7/doc/librsync.3.man_pages	2008-12-20 13:48:11.000000000 +0100
@@ -53,7 +53,7 @@
 .PP
 .I rdiff and librsync Manual
 .PP
-\fIhttp://rproxy.sourceforge.net/\fP or \fIhttp://linuxcare.com.au/rproxy/\fP.
+\fIhttp://rproxy.sourceforge.net/\fP.
 .PP
 \fIdraft-pool-rsync\fP
 .SH BUGS


Index: librsync.spec
===================================================================
RCS file: /cvs/extras/rpms/librsync/EL-4/librsync.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- librsync.spec	28 Aug 2007 22:02:19 -0000	1.11
+++ librsync.spec	20 Dec 2008 13:22:43 -0000	1.12
@@ -1,12 +1,14 @@
 Summary:        Rsync libraries
 Name:           librsync
 Version:        0.9.7
-Release:        11%{?dist}
+Release:        13%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://librsync.sourceforge.net/
-Source:         http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Patch:          librsync-0.9.7-lfs_overflow.patch
+Source:         http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Patch0:         librsync-0.9.7-lfs_overflow.patch
+Patch1:         librsync-0.9.7-getopt.patch
+Patch2:         librsync-0.9.7-man_pages.patch
 BuildRequires:  zlib-devel, bzip2-devel, %{_includedir}/popt.h, libtool
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,9 +40,12 @@
 
 %prep
 %setup -q
-%patch -p1 -b .lfs_overflow
+%patch0 -p1 -b .lfs_overflow
+%patch1 -p1 -b .getopt
+%patch2 -p1 -b .man_pages
 
 %build
+libtoolize
 autoreconf -f
 %configure --enable-shared
 make %{?_smp_mflags}
@@ -73,6 +78,15 @@
 %{_mandir}/man3/librsync.3*
 
 %changelog
+* Sat Dec 20 2008 Robert Scheck <robert at fedoraproject.org> 0.9.7-13
+- Run libtoolize before %%configure to avoid libtool 2.2 errors
+- Added a patch to make rdiff aware of -i and -z getopt options
+- Updated man page for how to use rdiff and removed a dead link
+
+* Sun Feb 10 2008 Robert Scheck <robert at fedoraproject.org> 0.9.7-12
+- Rebuilt against gcc 4.3
+- Updated the source URL to match with the guidelines
+
 * Tue Aug 28 2007 Robert Scheck <robert at fedoraproject.org> 0.9.7-11
 - Updated the license tag according to the guidelines
 - Buildrequire %%{_includedir}/popt.h for separate popt (#249352)