SPECS: rsync.spec - rel 3; acl/xattr compat with our older, patched rsyncs

[arekm]

Author: arekm                        Date: Tue Jun  3 18:42:36 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3; acl/xattr compat with our older, patched rsyncs

---- Files affected:
SPECS:
   rsync.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: SPECS/rsync.spec
diff -u SPECS/rsync.spec:1.134 SPECS/rsync.spec:1.135
--- SPECS/rsync.spec:1.134	Fri Apr 11 09:22:14 2008
+++ SPECS/rsync.spec	Tue Jun  3 20:42:30 2008
@@ -18,15 +18,17 @@
 Summary(zh_TW.UTF-8):	[喙啪]$(B6G?i火(c(B
 Name:		rsync
 Version:	3.0.2
-Release:	2
+Release:	3
 License:	GPL
 Group:		Networking/Utilities
 Source0:	http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
 # Source0-md5:	fd4c5d77d8cb7bb86ab209076fa214d9
-Source1:	%{name}.inet
-Source2:	%{name}.init
-Source3:	%{name}.sysconfig
-Source4:	%{name}d.logrotate
+Source1:	http://rsync.samba.org/ftp/rsync/rsync-patches-%{version}.tar.gz
+# Source1-md5:	c076661c447ddc165f4ff427e7264a31
+Source2:	%{name}.inet
+Source3:	%{name}.init
+Source4:	%{name}.sysconfig
+Source5:	%{name}d.logrotate
 Patch0:		%{name}-config.patch
 URL:		http://rsync.samba.org/
 BuildRequires:	acl-devel
@@ -152,9 +154,13 @@
 techniczna nowego algorytmu została również dołączona do pakietu.
 
 %prep
-%setup -q
+%setup -q -b1
 %patch0 -p1
 
+# for compat with previous patched version
+patch -p1 -i patches/acls.diff || exit 1
+patch -p1 -i patches/xattrs.diff || exit 1
+
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoheader}
@@ -200,10 +206,10 @@
 #RSYNC_PASSWORD=
 EOF
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/rsyncd
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyncd
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rsyncd
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/rsyncd
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/rsyncd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyncd
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rsyncd
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/rsyncd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -266,6 +272,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2008-06-03 18:42:30  arekm
+- rel 3; acl/xattr compat with our older, patched rsyncs
+
 Revision 1.134  2008-04-11 07:22:14  glen
 - release 2 (1 for ac)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rsync.spec?r1=1.134&r2=1.135&f=u