rpms/tftp/F-9 tftp.spec,1.44,1.45

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/tftp/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29884

Modified Files:
	tftp.spec 
Log Message:
* Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 0.48-5
- fix troubles caused by added symlink



Index: tftp.spec
===================================================================
RCS file: /cvs/extras/rpms/tftp/F-9/tftp.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- tftp.spec	20 May 2008 10:11:39 -0000	1.44
+++ tftp.spec	21 May 2008 15:05:35 -0000	1.45
@@ -3,7 +3,7 @@
 Summary: The client for the Trivial File Transfer Protocol (TFTP)
 Name: tftp
 Version: %{tftp_hpa_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Applications/Internet
 Source0: http://www.kernel.org/pub/software/network/tftp/tftp-hpa-%{tftp_hpa_version}.tar.gz
@@ -55,7 +55,6 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,8}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tftpboot
-ln -s %{_localstatedir}/lib/tftpboot ${RPM_BUILD_ROOT}/tftpboot
 
 make INSTALLROOT=${RPM_BUILD_ROOT} SBINDIR=%{_sbindir} MANDIR=%{_mandir} INSTALL='install -p' install
 install -m755 -d -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/ ${RPM_BUILD_ROOT}%{_localstatedir}/lib/tftpboot
@@ -65,11 +64,17 @@
 
 %post server
 /sbin/service xinetd reload > /dev/null 2>&1 || :
+if [ ! -e /tftpboot ]; then
+    ln -s %{_localstatedir}/lib/tftpboot /
+fi
 
 %postun server
 if [ $1 = 0 ]; then
     /sbin/service xinetd reload > /dev/null 2>&1 || :
 fi
+if [ -h /tftpboot ]; then
+    rm -f /tftpboot
+fi
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -85,15 +90,17 @@
 %doc README* CHANGES
 %config(noreplace) %{_sysconfdir}/xinetd.d/tftp
 %dir %{_localstatedir}/lib/tftpboot
-/tftpboot
 %{_sbindir}/in.tftpd
 %{_mandir}/man8/*
 
 %changelog
-* Tue May 20 2008 Martin Nagy <mnagy at redhat.com> - 0.48-3
+* Wed May 21 2008 Martin Nagy <mnagy at redhat.com> - 0.48-5
+- fix troubles caused by added symlink
+
+* Tue May 20 2008 Martin Nagy <mnagy at redhat.com> - 0.48-4
 - add symlink to /var/lib/tftpboot
 
-* Mon Mar 03 2008 Martin Nagy <mnagy at redhat.com> - 0.48-2
+* Mon Mar 03 2008 Martin Nagy <mnagy at redhat.com> - 0.48-3
 - changed description (#234099)
 
 * Mon Feb 11 2008 Martin Nagy <mnagy at redhat.com> - 0.48-2