--- rpms/smeserver-thinclient/contribs10/smeserver-thinclient.spec	2020/10/29 18:35:40	1.1
+++ rpms/smeserver-thinclient/contribs10/smeserver-thinclient.spec	2022/04/30 02:49:07	1.3
@@ -1,12 +1,12 @@
-# $Id: smeserver-thinclient.spec,v 1.3 2016/04/25 06:54:57 trevorbatley Exp $
+# $Id: smeserver-thinclient.spec,v 1.3 2020/10/29 18:45:26 trevorb Exp $
 # Authority: nocvs
 # Name: Trevor Batley
 
 Summary: Allow pxeboot of Thin Client workstations over network
 %define name smeserver-thinclient
 Name: %{name}
-%define version 2.1
-%define release 3
+%define version 2.2
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,24 +14,34 @@ Group: Network
 Source: %{name}-%{version}.tar.xz
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
-Requires: e-smith-base
+Requires: e-smith-base, smeserver-pxe
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReq: yes
-Patch1: smeserver-thinclient-2.1-tftpdconf.patch
-Patch2: smeserver-thinclient-2.1-archive.patch
 
 %description
-Allows for diskless workstation boot of Thin Clients over network. 
+Manage diskless workstation/device booting over network. 
 PXE capable NIC and BIOS required on target machine
-tftp server reqired. Can be on sme server - requires smeserver-tftpd or elsewhere in network
-Assumes sme server is acting as dhcp server
+Basic PXE booting is enabled via smeserver-pxe. This contrib manages what the pxe clients use.
+A tftp server is reqired. Can be on sme server (eg smeserver-tftp) or elsewhere in network
+Requires sme server to be acting as the dhcp server
 
 %changelog
+* Thu Apr 28 2022 Trevor Batley <trevor@batley.id.au> 2.2-1.sme
+- added /etc/dhcpd.thinclient include file for pxe clients
+- remove core pxe components and add requirement for smeserver-pxe [SME: 11960]
+- add options for different architectures [SME: 10821]
+- change back to using / updating tftp [SME: 11939]
+- fixed some dodgy db parameter processing
+- rollup patches (archive.patch, tftpd.conf)
+
+* Thu Oct 29 2020 Brian Read <brianr@bjsystems.co.uk> 2.1-4.sme
+- Initial import to SME10 tree [SME: 11073]
+
 * Mon Apr 25 2016 Trevor Batley <trevorbatley@users.sourceforge.net> 2.1-3
 - Allow upload and extract of 'Distribution' archives for loading into /tftpboot [9481]
 - Always set tftproot as /tftpboot as default [9441]
 
-* Sun Apr 4 2016 Trevor Batley <trevorbatley@usres.sourceforge.net> 2.1-2
+* Mon Apr 4 2016 Trevor Batley <trevorbatley@users.sourceforge.net> 2.1-2
 - Run tftpd-conf when tftp server is set to Self and tftpd exists [9417]
 - Also remove the services2adjust restart of tftpd, which was trying to do the same
 
@@ -52,7 +62,7 @@ Assumes sme server is acting as dhcp ser
 * Tue Apr 4 2006 Trevor Batley <trevor@batley.id.au> - 2.0-4
 - Got rid of superfluous 3 level version number and reverted to 2 levels
 
-* Sun Apr 1 2006 Trevor Batley <trevor@batley.id.au> - 2.0.0-3
+* Sat Apr 1 2006 Trevor Batley <trevor@batley.id.au> - 2.0.0-3
 - Tidied up some of the references to pxe parameters in panel
 - Changed panel to look for the tftpd{directory} parameter for populating tftproot
 
@@ -86,7 +96,7 @@ Assumes sme server is acting as dhcp ser
 - Display error messages on Workstation & Distribution panels
 - Added tick/cross and coloured Operation Status report
 
-* Wed Apr 01 2004 Trevor Batley <trevor@batley.id.au> - 1.2.0-1
+* Thu Apr 1 2004 Trevor Batley <trevor@batley.id.au> - 1.2.0-1
 - Add functionality into panel to add/remove distributions via rpm (file on local workstation)
 
 * Wed Mar 24 2004 Trevor Batley <trevor@batley.id.au>
@@ -133,8 +143,6 @@ Assumes sme server is acting as dhcp ser
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
 
 %build
 perl createlinks