Merge review fixes (bz#226380)

rsync.spec

@@ -1,17 +1,17 @@
-Summary: A program for synchronizing files over a network.
+Summary: A program for synchronizing files over a network
 Name: rsync
 Version: 3.0.4
 Release: 0%{?dist}
 Group: Applications/Internet
+URL: http://rsync.samba.org/
 # 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}.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
 Source2: rsync.xinetd
-BuildRequires: libacl-devel, libattr-devel, autoconf, make, gcc, popt-devel
-Prefix: %{_prefix}
-BuildRoot: /var/tmp/%{name}-root
+BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License: GPLv3+
 
 %description
@@ -47,9 +47,9 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
-mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
-install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.d/rsync
+%makeinstall INSTALLCMD='install -p' INSTALLMAN='install -p'
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -57,9 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc COPYING NEWS OLDNEWS README support/ tech_report.tex
-%config(noreplace) /etc/xinetd.d/rsync
-%{_prefix}/bin/rsync
-%{_mandir}/man1/rsync.1*
+%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1*
 %{_mandir}/man5/rsyncd.conf.5*
 
 %changelog
@@ -407,7 +407,7 @@ rm -rf $RPM_BUILD_ROOT
   showing no packager nor signature but giving 
   "Source RPM: rsync-1.6.3-1.src.rpm".
 - 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>
 - rsync-1.6.2-1 packaged.  (This entry by jam to credit Michael for the