X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rsync.spec;h=0f89bb3f5c6b6ab0a3c299051b2096291e6c2d5e;hb=f3d18efe962af0da047ec29cc34166a4cecd0bc0;hp=e26510d89e197bee57665706f336b5c750266510;hpb=abbf71c4c75efbb3ddda3cd27c23dce4a8feeff8;p=packages%2Frsync.git

diff --git a/rsync.spec b/rsync.spec
index e26510d..0f89bb3 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,3 +1,8 @@
+#
+# Conditional build:
+%bcond_with	rsh	# set remote shell command to rsh instead of ssh (old behaviour)
+%bcond_without	tests	# do not perform "make test"
+#
 Summary:	Program for efficient remote updates of files
 Summary(es):	Programa para actualizar archivos remotos de forma eficiente
 Summary(ko):	³×Æ®¿öÅ©¸¦ ÅëÇÑ ÆÄÀϵ¿±âÈ­¸¦ À§ÇÑ ÇÁ·Î±×·¥
@@ -8,22 +13,25 @@ Summary(uk):	
 Summary(zh_CN):	[ͨѶ]´«Ê乤¾ß
 Summary(zh_TW):	[³ñ°Ô]$(B6G?i¤õ(c(B
 Name:		rsync
-Version:	2.5.7
+Version:	2.6.7
 Release:	1
 License:	GPL
-Group:		Daemons
+Group:		Networking/Utilities
 Source0:	http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
-# Source0-md5:	9b3ec929091d7849f42b973247918a55
+# Source0-md5:	fb51636c719e789244d5d4423cf157ac
 Source1:	%{name}.inet
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Source4:	%{name}d.logrotate
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-man.patch
-Patch2:		%{name}-segv.patch
-BuildRequires:	autoconf
+URL:		http://rsync.samba.org/
+BuildRequires:	acl-devel
+BuildRequires:	autoconf >= 2.52
+BuildRequires:	automake
+BuildRequires:	openssl-devel
 BuildRequires:	popt-devel
-URL:		http://samba.anu.edu.au/rsync/
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/rsyncd
@@ -89,9 +97,9 @@ rsync - 
 %package -n rsyncd-inetd
 Summary:	Files necessary to run rsync in daemon mode
 Summary(pl):	Pliki niezbêdne do uruchomienia rsynca w trybie serwera
-Group:		Daemons
-PreReq:		rc-inetd
-Requires:	%{name}
+Group:		Networking/Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	rc-inetd
 Provides:	rsyncd
 Obsoletes:	rsyncd
 Obsoletes:	rsyncd-standalone
@@ -116,9 +124,9 @@ techniczna nowego algorytmu zosta
 %package -n rsyncd-standalone
 Summary:	Files necessary to run rsync in daemon mode
 Summary(pl):	Pliki niezbêdne do uruchomienia rsynca w trybie serwera
-Group:		Daemons
-Requires(post,preun):/sbin/chkconfig
-Requires:	%{name}
+Group:		Networking/Daemons
+Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
 Provides:	rsyncd
 Obsoletes:	rsyncd
 Obsoletes:	rsyncd-inetd
@@ -141,21 +149,32 @@ komunikacji i transportu plik
 techniczna nowego algorytmu zosta³a równie¿ do³±czona do pakietu.
 
 %prep
-%setup  -q
+%setup -q
+patch -s -p1 < patches/acls.diff || exit 1
+patch -s -p1 < patches/xattrs.diff || exit 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
 
 %build
+cp -f /usr/share/automake/config.sub .
+%{__autoheader}
 %{__autoconf}
 %configure \
+	%{?with_rsh:--with-rsh=rsh} \
 	--enable-ipv6 \
-	--disable-debug
-
+	--enable-acl-support \
+	--enable-xattr-support \
+	--disable-debug \
+	--with-rsyncd-conf=%{_sysconfdir}/rsyncd.conf
+%{__make} proto
 %{__make}
 
+%{?with_tests:%{__make} test}
+
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/env.d
 
 %{__make} install \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -171,6 +190,19 @@ cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/rsyncd.conf
 log file = /var/log/rsyncd.log
 EOF
 
+cat << EOF > $RPM_BUILD_ROOT/etc/env.d/CVSIGNORE
+#CVSIGNORE=
+EOF
+cat << EOF > $RPM_BUILD_ROOT/etc/env.d/RSYNC_RSH
+#RSYNC_RSH=
+EOF
+cat << EOF > $RPM_BUILD_ROOT/etc/env.d/RSYNC_PROXY
+#RSYNC_PROXY=
+EOF
+cat << EOF > $RPM_BUILD_ROOT/etc/env.d/RSYNC_PASSWORD
+#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
@@ -180,36 +212,27 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/rsyncd
 rm -rf $RPM_BUILD_ROOT
 
 %post -n rsyncd-inetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
-        /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
-        echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun -n rsyncd-inetd
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-	/etc/rc.d/init.d/rc-inetd reload 1>&2
+if [ "$1" = "0" ]; then
+	%service -q rc-inetd reload
 fi
 
 %post -n rsyncd-standalone
 /sbin/chkconfig --add rsyncd
-if [ -f /var/lock/subsys/rsyncd ]; then
-	/etc/rc.d/init.d/rsyncd restart 1>&2
-else
-	echo "Type \"/etc/rc.d/init.d/rsyncd start\" to start rsync server" 1>&2
-fi
+%service rsyncd restart "rsync server"
 
 %preun -n rsyncd-standalone
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/rsyncd ]; then
-		/etc/rc.d/init.d/rsyncd stop 1>&2
-	fi
+	%service rsyncd stop
 	/sbin/chkconfig --del rsyncd
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README NEWS OLDNEWS TODO
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 
@@ -218,8 +241,8 @@ fi
 %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %{_sysconfdir}/rsyncd.conf
 %attr(640,root,root) %config(noreplace) %{_sysconfdir}/rsyncd.secrets
-%attr(640,root,root) %config(noreplace) /etc/logrotate.d/rsyncd
-%attr(640,root,root) /etc/sysconfig/rc-inetd/rsyncd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rsyncd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/rsyncd
 %attr(640,root,root) %ghost /var/log/rsyncd.log
 %{_mandir}/man5/*
 
@@ -228,8 +251,8 @@ fi
 %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %{_sysconfdir}/rsyncd.conf
 %attr(640,root,root) %config(noreplace) %{_sysconfdir}/rsyncd.secrets
-%attr(640,root,root) %config(noreplace) /etc/sysconfig/rsyncd
-%attr(640,root,root) %config(noreplace) /etc/logrotate.d/rsyncd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rsyncd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rsyncd
 %attr(640,root,root) %ghost /var/log/rsyncd.log
 %attr(754,root,root) /etc/rc.d/init.d/rsyncd
 %{_mandir}/man5/*