- up to 2.6.9

[packages/rsync.git] / rsync.spec

diff --git a/rsync.spec b/rsync.spec
index 24677fdc914fb0c7ec5410ba839ba6e92b57b119..433d82d99aedb6f8ef909e8ab46448a1a5b8ae74 100644 (file)
--- a/rsync.spec
+++ b/rsync.spec
@@ -3,6 +3,9 @@
 %bcond_with    rsh     # set remote shell command to rsh instead of ssh (old behaviour)
 %bcond_without tests   # do not perform "make test"
 #
+%ifarch alpha
+%undefine      with_tests
+%endif
 Summary:       Program for efficient remote updates of files
 Summary(es):   Programa para actualizar archivos remotos de forma eficiente
 Summary(ko):   ³×Æ®¿öÅ©¸¦ ÅëÇÑ ÆÄÀϵ¿±âÈ­¸¦ À§ÇÑ ÇÁ·Î±×·¥
@@ -13,26 +16,25 @@ Summary(uk):        
 Summary(zh_CN):        [ͨѶ]´«Ê乤¾ß
 Summary(zh_TW):        [³ñ°Ô]\e$(B6G?i¤õ(c\e(B
 Name:          rsync
-Version:       2.6.7
-Release:       2
+Version:       2.6.9
+Release:       1
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
-# Source0-md5: fb51636c719e789244d5d4423cf157ac
+# Source0-md5: 996d8d8831dbca17910094e56dcb5942
 Source1:       %{name}.inet
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
 Source4:       %{name}d.logrotate
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-man.patch
-Patch2:                %{name}-exclude.patch
 URL:           http://rsync.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: openssl-devel
 BuildRequires: popt-devel
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.318
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/rsyncd
@@ -155,7 +157,6 @@ patch -s -p1 < patches/acls.diff || exit 1
 patch -s -p1 < patches/xattrs.diff || exit 1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -175,15 +176,13 @@ cp -f /usr/share/automake/config.sub .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/env.d
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{sysconfig/rc-inetd,rc.d/init.d,logrotate.d,env.d},/var/log}
 
 %{__make} install \
        prefix=$RPM_BUILD_ROOT%{_prefix} \
        mandir=$RPM_BUILD_ROOT%{_mandir} \
        bindir=$RPM_BUILD_ROOT%{_bindir}
 
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{sysconfig/rc-inetd,rc.d/init.d,logrotate.d},/var/log}
-
 :> $RPM_BUILD_ROOT/var/log/rsyncd.log
 :> $RPM_BUILD_ROOT%{_sysconfdir}/rsyncd.secrets
 
@@ -191,16 +190,16 @@ cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/rsyncd.conf
 log file = /var/log/rsyncd.log
 EOF
 
-cat << EOF > $RPM_BUILD_ROOT/etc/env.d/CVSIGNORE
+cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/CVSIGNORE
 #CVSIGNORE=
 EOF
-cat << EOF > $RPM_BUILD_ROOT/etc/env.d/RSYNC_RSH
+cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/RSYNC_RSH
 #RSYNC_RSH=
 EOF
-cat << EOF > $RPM_BUILD_ROOT/etc/env.d/RSYNC_PROXY
+cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/RSYNC_PROXY
 #RSYNC_PROXY=
 EOF
-cat << EOF > $RPM_BUILD_ROOT/etc/env.d/RSYNC_PASSWORD
+cat << 'EOF' > $RPM_BUILD_ROOT/etc/env.d/RSYNC_PASSWORD
 #RSYNC_PASSWORD=
 EOF
 
@@ -212,6 +211,12 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/rsyncd
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%env_update
+
+%postun
+%env_update
+
 %post -n rsyncd-inetd
 %service -q rc-inetd reload
 
@@ -233,7 +238,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README NEWS OLDNEWS TODO
-%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
+%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*