--- rsync.spec.orig	2009-10-16 21:10:26.000000000 +0200
+++ rsync.spec	2009-10-17 08:59:06.000000000 +0200
@@ -7,16 +7,18 @@
 Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.6
-Release: 3%{?prerelease}%{?dist}
+Release: 3%{?prerelease}%{?dist}.dh.1
 Group: Applications/Internet
 URL: http://rsync.samba.org/
 
 Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}%{?prerelease}.tar.gz
 Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}%{?prerelease}.tar.gz
 Source2: rsync.xinetd
+Patch0: rsync-zlib.patch
 BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
+Requires: %{name}-zlib = %{version}-%{release}
 
 %description
 Rsync uses a reliable algorithm to bring remote and host files into
@@ -27,6 +29,21 @@ just as a more capable replacement for t
 report which describes the rsync algorithm is included in this
 package.
 
+%package zlib
+Summary: Rsync-specific fork of zlib
+Group: System Environment/Libraries
+
+%description zlib
+Rsync-specific fork of zlib.
+
+%package zlib-devel
+Summary: Development files for rsync-specific fork of zlib
+Group: Development/Libraries
+Requires: %{name}-zlib = %{version}-%{release}
+
+%description zlib-devel
+Development files for rsync-specific fork of zlib.
+
 %prep
 # TAG: for pre versions use
 
@@ -38,6 +55,8 @@ package.
 %setup -q -b 1
 %endif
 
+%patch0 -p1 -b .zlib
+
 chmod -x support/*
 
 #Needed for compatibility with previous patched rsync versions
@@ -53,7 +72,7 @@ autoconf
 autoheader
 %configure
 make proto
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,6 +84,10 @@ install -p -m 644 %{SOURCE2} $RPM_BUILD_
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post zlib -p /sbin/ldconfig
+
+%postun zlib -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %doc COPYING NEWS OLDNEWS README support/ tech_report.tex
@@ -73,6 +96,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man5/rsyncd.conf.5*
 
+%files zlib
+%{_libdir}/*.so.*
+
+%files zlib-devel
+%{_libdir}/*.so
+%{_includedir}/rsync-zlib
+
 %changelog
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild