[cvs] Clean spec file

[Petr Pisar]

commit d3f040a5a44e18a4c9b8f6026faae239d8891eac
Author: Petr Písař <ppisar at redhat.com>
Date:   Tue Mar 15 18:05:54 2011 +0100

    Clean spec file

 cvs.spec |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/cvs.spec b/cvs.spec
index 15d8b0a..9581ebe 100644
--- a/cvs.spec
+++ b/cvs.spec
@@ -21,7 +21,6 @@ Source4: cvs.csh
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: vim-minimal
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.58, automake >= 1.7.9, libtool, zlib-devel
 BuildRequires: vim-minimal
 %if %{kerberized}
@@ -99,8 +98,8 @@ pages in PDF.
 %patch4 -p1 -b .bs
 %patch5 -p1 -b .proxy
 %patch7 -p1 -b .log
-%patch8 -p1
-%patch9 -p1
+%patch8 -p1 -b .tagname
+%patch9 -p1 -b .comp
 %patch11 -p1 -b .tmp
 
 %if %{pamified}
@@ -111,7 +110,7 @@ pages in PDF.
 %patch14 -p1 -b .diff-kk
 %patch15 -p1 -b .env
 %patch17 -p1 -b .ipv6
-%patch19 -p1 -b getline64
+%patch19 -p1 -b .getline64
 %patch20 -p1 -b .stdinargs
 %patch21 -p1 -b .cve-2010-3846
 %patch22 -p1 -b .undefined_date
@@ -122,9 +121,11 @@ pages in PDF.
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
-iconv -f ISO-8859-1 -t UTF-8 < FAQ > FAQ.UTF8
-touch -r FAQ FAQ.UTF8
-mv FAQ.UTF8 FAQ
+for F in FAQ; do
+    iconv -f ISO-8859-1 -t UTF-8 < "$F" > "${F}.UTF8"
+    touch -r "$F"{,.UTF8}
+    mv "$F"{.UTF8,}
+done
 
 %build
 autoreconf
@@ -141,18 +142,18 @@ autoreconf
 	KRB_CONFIG="--with-gssapi --without-krb4 --enable-encryption"
 %endif
 
-%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 %-D_LARGEFILE64_SOURCE" \
+%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS \
+    -D_FILE_OFFSET_BITS=64 %-D_LARGEFILE64_SOURCE" \
     $PAM_CONFIG $KRB_CONFIG CSH=/bin/csh
 
 make %{?_smp_mflags}
 
 %check
-if [ `id -u` -ne 0 ] ; then
+if [ $(id -u) -ne 0 ] ; then
 	make check
 fi
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p"
 # forcefully compress the info pages so that install-info will work properly
 # in the %%post
@@ -162,15 +163,12 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
 %if %{pamified}
-install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/cvs
+    install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/cvs
 %endif
 install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/cvs.sh
 install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/cvs.csh
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 /sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir
 /sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir
@@ -208,6 +206,7 @@ exit 0
 %changelog
 * Tue Mar 15 2011 Petr Pisar <ppisar at redhat.com> - 1.11.23-16
 - Back-port KeywordExpand configuration keyword
+- Clean spec file
 
 * Thu Mar 10 2011 Petr Pisar <ppisar at redhat.com> - 1.11.23-15
 - Set PAM_TTY and PAM_RHOST on PAM authentication