OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rsync?expand=0&rev=4

rsync.spec

@@ -18,7 +18,7 @@ Group:          Productivity/Networking/Other
 PreReq:         %fillup_prereq %insserv_prereq
 Autoreqprov:    on
 Version:        2.6.9
-Release:        1
+Release:        3
 Summary:        Replacement for RCP/mirror that has Many More Features
 Source:         samba.org/ftp/rsync/rsync-%{version}.tar.bz2
 Source1:        logrotate.rsync
@@ -31,6 +31,7 @@ Patch2:         slp.diff
 Patch3:         system-zlib.diff
 URL:            http://rsync.samba.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%define with_system_zlib 0
 
 %description
 rsync uses the "rsync algorithm" which provides a very fast method for
@@ -52,7 +53,10 @@ Authors:
 
 %prep
 %setup -q
+%if %with_system_zlib
+rm -f zlib/*.h
 %patch3
+%endif
 cp configure configure.orig
 patch -p1 < patches/acls.diff
 patch -p1 < patches/xattrs.diff
@@ -125,6 +129,8 @@ ln -sf ../../etc/init.d/rsyncd                $RPM_BUILD_ROOT/usr/sbin/rcrsyncd
 %doc COPYING NEWS README tech_report.ps tech_report.tex
 
 %changelog
+* Tue May 08 2007 - dmueller@suse.de
+- use builtin zlib copy again
 * Mon May 07 2007 - dmueller@suse.de
 - update to 2.6.9:
   * several important bugfixes