Merge review fixes (bz#226380)

This commit is contained in:
Simo Sorce 2009-01-01 19:20:31 +00:00
parent 0753f02ecc
commit 3b935d4f31

View File

@ -1,17 +1,17 @@
Summary: A program for synchronizing files over a network. Summary: A program for synchronizing files over a network
Name: rsync Name: rsync
Version: 3.0.4 Version: 3.0.4
Release: 0%{?dist} Release: 0%{?dist}
Group: Applications/Internet Group: Applications/Internet
URL: http://rsync.samba.org/
# TAG: for pre versions use # TAG: for pre versions use
#Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre3.tar.gz #Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}pre3.tar.gz
Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz Source0: ftp://rsync.samba.org/pub/rsync/rsync-%{version}.tar.gz
#Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre3.tar.gz #Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}pre3.tar.gz
Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz Source1: ftp://rsync.samba.org/pub/rsync/rsync-patches-%{version}.tar.gz
Source2: rsync.xinetd Source2: rsync.xinetd
BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc, popt-devel BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRoot: /var/tmp/%{name}-root
License: GPLv3+ License: GPLv3+
%description %description
@ -47,9 +47,9 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%makeinstall %makeinstall INSTALLCMD='install -p' INSTALLMAN='install -p'
mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.d/rsync install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -57,9 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING NEWS OLDNEWS README support/ tech_report.tex %doc COPYING NEWS OLDNEWS README support/ tech_report.tex
%config(noreplace) /etc/xinetd.d/rsync %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
%{_prefix}/bin/rsync %{_bindir}/%{name}
%{_mandir}/man1/rsync.1* %{_mandir}/man1/%{name}.1*
%{_mandir}/man5/rsyncd.conf.5* %{_mandir}/man5/rsyncd.conf.5*
%changelog %changelog
@ -407,7 +407,7 @@ rm -rf $RPM_BUILD_ROOT
showing no packager nor signature but giving showing no packager nor signature but giving
"Source RPM: rsync-1.6.3-1.src.rpm". "Source RPM: rsync-1.6.3-1.src.rpm".
- Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip - Changes from 1.6.2-1 packaging: added '$RPM_OPT_FLAGS' to make, strip
to '%build', removed '%prefix'. to '%%build', removed '%%prefix'.
* Thu Apr 10 1997 Michael De La Rue <miked@ed.ac.uk> * Thu Apr 10 1997 Michael De La Rue <miked@ed.ac.uk>
- rsync-1.6.2-1 packaged. (This entry by jam to credit Michael for the - rsync-1.6.2-1 packaged. (This entry by jam to credit Michael for the