- rel 3

[packages/rsync.git] / rsync.spec

diff --git a/rsync.spec b/rsync.spec
index 821ca61f6c154220333b803bbf5cd02590ca683a..69357e29ec940227f49ab5fda7d9f4d71c286e32 100644 (file)
--- a/rsync.spec
+++ b/rsync.spec
@@ -13,12 +13,12 @@ Summary(uk):        
 Summary(zh_CN):        [ͨѶ]´«Ê乤¾ß
 Summary(zh_TW):        [³ñ°Ô]\e$(B6G?i¤õ(c\e(B
 Name:          rsync
-Version:       2.6.7
-Release:       1
+Version:       2.6.8
+Release:       3
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://rsync.samba.org/ftp/rsync/%{name}-%{version}.tar.gz
-# Source0-md5: fb51636c719e789244d5d4423cf157ac
+# Source0-md5: 082a9dba1f741e6591e5cd748a1233de
 Source1:       %{name}.inet
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -26,11 +26,12 @@ Source4:    %{name}d.logrotate
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-man.patch
 URL:           http://rsync.samba.org/
+BuildRequires: acl-devel
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
-BuildRequires: acl-devel
 BuildRequires: openssl-devel
 BuildRequires: popt-devel
+BuildRequires: rpmbuild(macros) >= 1.318
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/rsyncd
@@ -97,8 +98,8 @@ rsync - 
 Summary:       Files necessary to run rsync in daemon mode
 Summary(pl):   Pliki niezbêdne do uruchomienia rsynca w trybie serwera
 Group:         Networking/Daemons
-PreReq:                rc-inetd
 Requires:      %{name} = %{version}-%{release}
+Requires:      rc-inetd
 Provides:      rsyncd
 Obsoletes:     rsyncd
 Obsoletes:     rsyncd-standalone
@@ -154,7 +155,6 @@ patch -s -p1 < patches/xattrs.diff || exit 1
 %patch0 -p1
 %patch1 -p1
 
-
 %build
 cp -f /usr/share/automake/config.sub .
 %{__autoheader}
@@ -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,38 +208,34 @@ 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
-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 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/*