X-Git-Url: http://git.pld-linux.org/?p=packages%2Frsync.git;a=blobdiff_plain;f=rsync.spec;h=a257e2df417b2d03f46f9c4ab21341baac89ce56;hp=74df5ebc0edf35ccb185a4debe81d9869fa85754;hb=615041e096bf687532c390c51043f93d15f4801e;hpb=652c814a95b69fc6300cd14b9131fec819ef9bdd

diff --git a/rsync.spec b/rsync.spec
index 74df5eb..a257e2d 100644
--- a/rsync.spec
+++ b/rsync.spec
@@ -1,3 +1,4 @@
+# TODO: 3.1.3 rsyncd segfaults very early in server rsync:// mode (both inetd and standalone)
 #
 # Conditional build:
 %bcond_with	rsh	# set remote shell command to rsh instead of ssh (old behaviour)
@@ -16,29 +17,29 @@ Summary(uk.UTF-8):	Програма для ефективного віддале
 Summary(zh_CN.UTF-8):	[通讯]传输工具
 Summary(zh_TW.UTF-8):	[喙啪]$(B6G?i火(c(B
 Name:		rsync
-Version:	3.0.9
-Release:	1
-License:	GPL
+Version:	3.1.2
+Release:	3
+Epoch:		1
+License:	GPL v3+
 Group:		Networking/Utilities
 Source0:	http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
-# Source0-md5:	5ee72266fe2c1822333c407e1761b92b
+# Source0-md5:	0f758d7e000c0f7f7d3792610fad70cb
 Source1:	http://rsync.samba.org/ftp/rsync/rsync-patches-%{version}.tar.gz
-# Source1-md5:	992677c7f1ac2884d9469b3a0eff594a
+# Source1-md5:	f412602a3cba0b872adfaed905a0aa28
 Source2:	%{name}.inet
 Source3:	%{name}.init
 Source4:	%{name}.sysconfig
 Source5:	%{name}d.logrotate
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-dparam.patch
 URL:		http://rsync.samba.org/
 BuildRequires:	acl-devel
-BuildRequires:	autoconf >= 2.52
+BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-BuildRequires:	openssl-devel
 BuildRequires:	popt-devel
 BuildRequires:	rpmbuild(macros) >= 1.318
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_duplicate_files_terminate_build	0
 %define		_sysconfdir	/etc/rsyncd
 
 %description
@@ -156,12 +157,10 @@ techniczna nowego algorytmu została również dołączona do pakietu.
 %prep
 %setup -q -b1
 %patch0 -p1
-%patch1 -p1
 
 # for compat with previous patched version
 patch -p1 -i patches/acls.diff || exit 1
 patch -p1 -i patches/xattrs.diff || exit 1
-patch -p1 < patches/openssl-support.diff || exit 1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -172,7 +171,6 @@ cp -f /usr/share/automake/config.sub .
 	%{?with_rsh:--with-rsh=rsh} \
 	--enable-ipv6 \
 	--enable-acl-support \
-	--enable-openssl \
 	--enable-xattr-support \
 	--disable-debug \
 	--with-rsyncd-conf=%{_sysconfdir}/rsyncd.conf
@@ -244,10 +242,13 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README NEWS OLDNEWS TODO
-%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%doc README NEWS OLDNEWS TODO support
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/CVSIGNORE
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/RSYNC_PASSWORD
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/RSYNC_PROXY
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/RSYNC_RSH
+%attr(755,root,root) %{_bindir}/rsync
+%{_mandir}/man1/rsync.1*
 
 %files -n rsyncd-inetd
 %defattr(644,root,root,755)
@@ -257,7 +258,7 @@ fi
 %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/*
+%{_mandir}/man5/rsyncd.conf.5*
 
 %files -n rsyncd-standalone
 %defattr(644,root,root,755)
@@ -268,4 +269,4 @@ fi
 %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/*
+%{_mandir}/man5/rsyncd.conf.5*