From 4c6a45c4984aa98aaa44337cf0786a9fdf965a17 Mon Sep 17 00:00:00 2001
From: Maros Barabas <mbarabas@fedoraproject.org>
Date: Feb 19 2007 10:50:58 +0000
Subject: Merge review 226489


---

diff --git a/tftp.spec b/tftp.spec
index 428e2c8..f15b9a7 100644
--- a/tftp.spec
+++ b/tftp.spec
@@ -3,15 +3,16 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP).
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 3.2
+Release: 3.3
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
+URL: http://www.kernel.org/pub/software/network/tftp/
 Patch0: tftp-0.40-remap.patch
 Patch1: tftp-hpa-0.42-sigjmp.patch
 Patch2: tftp-hpa-0.39-tzfix.patch
-BuildPreReq: tcp_wrappers-devel
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: tcp_wrappers-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The Trivial File Transfer Protocol (TFTP) is normally used only for
@@ -22,7 +23,7 @@ and should not be enabled unless it is expressly needed.
 
 %package server
 Group: System Environment/Daemons
-Summary: The server for the Trivial File Transfer Protocol (TFTP).
+Summary: The server for the Trivial File Transfer Protocol (TFTP)
 Requires: xinetd
 
 %description server
@@ -50,9 +51,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 
-make INSTALLROOT=${RPM_BUILD_ROOT} \
-    SBINDIR=%{_sbindir} MANDIR=%{_mandir} \
-	install
+make INSTALLROOT=${RPM_BUILD_ROOT} SBINDIR=%{_sbindir} MANDIR=%{_mandir} install
 install -m755 -d ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/ ${RPM_BUILD_ROOT}/tftpboot
 install -m644 tftp-xinetd ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
 
@@ -80,6 +79,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man8/*
 
 %changelog
+* Mon Feb 19 2007 Maros Barabas <mbarabas@redhat.com> - 0.42-3.3
+- make some changes in spec file (review)
+- Resolves #226489
+
 * Mon Dec 04 2006 Maros Barabas <mbarabas@redhat.com> - 0.42-3.2
 - change BuildRequires from tcp_wrappers to tcp_wrappers-devel