From e2de161f8fdd7710ab03b703500d12cb728c42eb Mon Sep 17 00:00:00 2001
From: Martin Nagy <mnagy@fedoraproject.org>
Date: Tue, 22 Jan 2008 13:24:19 +0000
Subject: [PATCH] - upgrade to 0.48 - remove the old sigjmp patch (fixed in
 upstream) - make some changes in spec file (#226489)

---
 .cvsignore                 |  2 +-
 sources                    |  2 +-
 tftp-hpa-0.42-sigjmp.patch | 16 ----------------
 tftp.spec                  | 25 ++++++++++++++++---------
 4 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 tftp-hpa-0.42-sigjmp.patch

diff --git a/.cvsignore b/.cvsignore
index 5510e8a..148f127 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-tftp-hpa-0.42.tar.gz
+tftp-hpa-0.48.tar.gz
diff --git a/sources b/sources
index 3fa77b2..35c75b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98ecf77f8558b4f562794f71e29fed86  tftp-hpa-0.42.tar.gz
+73dd29dfa9062a174163f6a267e0b5f7  tftp-hpa-0.48.tar.gz
diff --git a/tftp-hpa-0.42-sigjmp.patch b/tftp-hpa-0.42-sigjmp.patch
deleted file mode 100644
index 0bcb89f..0000000
--- a/tftp-hpa-0.42-sigjmp.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tftp-hpa-0.42/tftp/main.c.old	2006-02-16 18:45:22.000000000 +0100
-+++ tftp-hpa-0.42/tftp/main.c	2006-03-22 11:52:10.000000000 +0100
-@@ -304,9 +305,11 @@
-     (*c->handler)(pargc, pargv);
-     exit(0);
-   }
--  if (sigsetjmp(toplevel,1) != 0)
-+  /*
-+  if (sigsetjmp(toplevel,1) != 0) {
-     (void)putchar('\n');
--  
-+  }
-+  */
- #ifdef WITH_READLINE
- #ifdef HAVE_READLINE_HISTORY_H
-   using_history();
diff --git a/tftp.spec b/tftp.spec
index c2d1910..1cea1c8 100644
--- a/tftp.spec
+++ b/tftp.spec
@@ -1,16 +1,15 @@
-%define tftp_hpa_version 0.42
+%define tftp_hpa_version 0.48
 
 Summary: The client for the Trivial File Transfer Protocol (TFTP)
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 6
+Release: 1%{?dist}
 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
 Patch3: tftp-0.42-tftpboot.patch
 
@@ -28,6 +27,8 @@ and should not be enabled unless it is expressly needed.
 Group: System Environment/Daemons
 Summary: The server for the Trivial File Transfer Protocol (TFTP)
 Requires: xinetd
+Requires(post): /sbin/service
+Requires(postun): /sbin/service
 
 %description server
 The Trivial File Transfer Protocol (TFTP) is normally used only for
@@ -40,7 +41,6 @@ enabled unless it is expressly needed.  The TFTP server is run from
 %prep
 %setup -q -n tftp-hpa-%{version} 
 %patch0 -p1 -b .zero
-%patch1 -p1 -b .sigjmp
 %patch2 -p1 -b .tzfix
 %patch3 -p1 -b .tftpboot
 
@@ -56,9 +56,9 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tftpboot
 
-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
+make INSTALLROOT=${RPM_BUILD_ROOT} SBINDIR=%{_sbindir} MANDIR=%{_mandir} INSTAL='instal -p' install
+install -m755 -d -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/ ${RPM_BUILD_ROOT}/tftpboot
+install -m644 -p tftp-xinetd ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/tftp
 
 %post server
 /sbin/service xinetd reload > /dev/null 2>&1 || :
@@ -72,18 +72,25 @@ fi
 rm -rf ${RPM_BUILD_ROOT}
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc README* CHANGES
 %{_bindir}/tftp
 %{_mandir}/man1/*
 
 %files server
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc README* CHANGES
 %config(noreplace) %{_sysconfdir}/xinetd.d/tftp
 %dir %{_localstatedir}/lib/tftpboot
 %{_sbindir}/in.tftpd
 %{_mandir}/man8/*
 
 %changelog
+* Tue Jan 22 2008 Martin Nagy <mnagy@redhat.com> - 0.48-1
+- upgrade to 0.48
+- remove the old sigjmp patch (fixed in upstream)
+- make some changes in spec file (#226489)
+
 * Tue Jan 22 2008 Martin Nagy <mnagy@redhat.com> - 0.42-6
 - changed the location of tftpboot directory to /var/lib/