[rsync/f17] Reverted: #495310 - rsync contains forked copy of zlib

[mluscon]

commit a516ed821037404f1ef4449e5b9ea90a3805a9b0
Author: Michal Luscon <mluscon at redhat.com>
Date:   Tue Oct 23 16:20:43 2012 +0200

    Reverted: #495310 - rsync contains forked copy of zlib

 rsync-3.0.10-bundled-zlib.patch |  165 ---------------------------------------
 rsync.spec                      |   18 ++--
 2 files changed, 9 insertions(+), 174 deletions(-)
---
diff --git a/rsync.spec b/rsync.spec
index 22e961c..76b3b0b 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -7,7 +7,7 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.9
-Release: 3%{?prerelease}%{?dist}
+Release: 4%{?prerelease}%{?dist}
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
@@ -18,8 +18,7 @@ BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel, zlib-devel
 Requires: zlib
 License: GPLv3+
 
-Patch0: rsync-3.0.10-bundled-zlib.patch
-Patch1: rsync-3.0.10-lose-track.patch
+Patch0: rsync-3.0.10-lose-track.patch
 
 %description
 Rsync uses a reliable algorithm to bring remote and host files into
@@ -50,17 +49,15 @@ patch -p1 -i patches/xattrs.diff
 #Enable --copy-devices parameter
 patch -p1 -i patches/copy-devices.diff
 
-%patch0 -p1 -b .bundled-zlib
-%patch1 -p1 -b .lose-track
+%patch0 -p1 -b .lose-track
 
 %build
 rm -fr autom4te.cache
 autoconf -o configure.sh
 autoheader && touch config.h.in
 
-%configure \
-  --with-included-zlib=no
-  
+%configure 
+    
 make proto
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
@@ -84,7 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Tue Oct 16 2012 Michal Luscon <mluscon at redhat.com> 3.0.9-4
+* Tue Oct 23 2012 Michal Luscon <mluscon at redhat.com> 3.0.9-4
+- Reverted: #495310 - rsync contains forked copy of zlib
+
+* Tue Oct 16 2012 Michal Luscon <mluscon at redhat.com> 3.0.9-3
 - Fixed: #823088 - rsync loses track of files with different directory prefixes
 - Fixed: #495310 - rsync contains forked copy of zlib