- rel 3

[packages/rsync.git] / rsync.spec

diff --git a/rsync.spec b/rsync.spec
index bec796003e07924c6dbee9d058f9858bb052e31c..69357e29ec940227f49ab5fda7d9f4d71c286e32 100644 (file)
--- a/rsync.spec
+++ b/rsync.spec
@@ -14,7 +14,7 @@ Summary(zh_CN):       [ͨѶ]
 Summary(zh_TW):        [³ñ°Ô]\e$(B6G?i¤õ(c\e(B
 Name:          rsync
 Version:       2.6.8
-Release:       1
+Release:       3
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
@@ -31,7 +31,7 @@ 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
@@ -173,15 +173,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
 
@@ -189,16 +187,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
 
@@ -210,6 +208,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
 
@@ -231,7 +235,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/*