From 1bcae310e68c3fd96f0117acc4103a94661a58f3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2015 03:37:29 +0000
Subject: import tftp-5.2-12.el7


---

diff --git a/SOURCES/tftp.service b/SOURCES/tftp.service
index cc5fdb8..c26ad3b 100644
--- a/SOURCES/tftp.service
+++ b/SOURCES/tftp.service
@@ -1,6 +1,11 @@
 [Unit]
 Description=Tftp Server
+Requires=tftp.socket
+Documentation=man:in.tftpd
 
 [Service]
 ExecStart=/usr/sbin/in.tftpd -s /var/lib/tftpboot
 StandardInput=socket
+
+[Install]
+Also=tftp.socket
diff --git a/SPECS/tftp.spec b/SPECS/tftp.spec
index cb887b6..f1f0916 100644
--- a/SPECS/tftp.spec
+++ b/SPECS/tftp.spec
@@ -4,7 +4,7 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP)
 Name: tftp
 Version: 5.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://www.kernel.org/pub/software/network/tftp/
@@ -34,17 +34,16 @@ 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)
-Requires: xinetd systemd-units
-Requires(post): /sbin/service, systemd-units
-Requires(postun): /sbin/service, systemd-units
+Requires: systemd-units
+Requires(post): systemd-units
+Requires(postun): systemd-units
 
 %description server
 The Trivial File Transfer Protocol (TFTP) is normally used only for
 booting diskless workstations.  The tftp-server package provides the
 server for TFTP, which allows users to transfer files to and from a
 remote machine. TFTP provides very little security, and should not be
-enabled unless it is expressly needed.  The TFTP server is run from
-%{_sysconfdir}/xinetd.d/tftp, and is disabled by default.
+enabled unless it is expressly needed.
 
 %prep
 %setup -q -n tftp-hpa-%{version} 
@@ -81,13 +80,13 @@ install -p -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_unitdir}
 install -p -m 644 %SOURCE2 ${RPM_BUILD_ROOT}%{_unitdir}
 
 %post server
-%systemd_post tftp.service
+%systemd_post tftp.socket
 
 %preun server
-%systemd_preun tftp.service
+%systemd_preun tftp.socket
 
 %postun server
-%systemd_postun_with_restart tftp.service
+%systemd_postun_with_restart tftp.socket
 
 
 %clean
@@ -107,6 +106,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_unitdir}/*
 
 %changelog
+* Tue Apr 28 2015 Jan Synáček <jsynacek@redhat.com> - 5.2-12
+- remove unnecessary installation dependency on xinetd(#1136866)
+- improve systemd unit files(#1167777)
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 5.2-11
 - Mass rebuild 2014-01-24