--- rpms/smeserver-bridge-interface/contribs10/smeserver-bridge-interface.spec	2021/01/14 20:20:40	1.2
+++ rpms/smeserver-bridge-interface/contribs10/smeserver-bridge-interface.spec	2021/03/23 17:19:55	1.8
@@ -1,9 +1,9 @@
-# $Id: smeserver-bridge-interface.spec,v 1.1 2021/01/14 20:08:15 brianr Exp $
+# $Id: smeserver-bridge-interface.spec,v 1.7 2021/01/28 07:20:28 brianr Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
 %define version 0.2
-%define release 2
+%define release 7
 %define name smeserver-bridge-interface
 
 
@@ -27,6 +27,12 @@ Conflicts:	smeserver-openvpn-bridge.fws
 Conflicts:	smeserver-openvpn-bridge-fws
 AutoReqProv:    no
 
+Patch0:smeserver-bridge-interface-0.2-Update-Createlinks-for-systemd.patch
+Patch1:smeserver-bridge-interface-0.2-Move-exec-to-sbin-e-smith-and-add-service-file.patch
+Patch2:smeserver-bridge-interface-0.2-Add-Restart-to-service-file.patch
+Patch3:smeserver-bridge-interface-0.2-Change-After-in-Service-file-to-network-service-from-target.patch
+Patch4: smeserver-bridge-interface-0.2-makeitcompatible.patch
+
 %description
 This package allows you to replace the internal interface with a bridge
 interface (and the original internal interface enslaved to it).
@@ -34,8 +40,22 @@ It's usefull for OpenVPN in bridge mode
 configuration
 
 %changelog
+* Tue Mar 23 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.2-7.sme
+- make bridge interface up on install [SME: 11485]
+- modify support for dhcp with bridge
+
+* Thu Jan 28 2021 Brian Read <brianr@bjsystems.co.uk> 0.2-6.sme
+- Change-After-in-Service-file-to-network-service-from-target [SME: 11324]
+
+* Sun Jan 24 2021 Brian Read <brianr@bjsystems.co.uk> 0.2-5.sme
+- Add-Restart-to-service-file.patch [SME: 11324 ]
+
+* Sat Jan 23 2021 Brian Read <brianr@bjsystems.co.uk> 0.2-4.sme
+- Move exec to  /sbin/e-smith/systemd/bridge-run, add service file [SME: 11324]
+
 * Thu Jan 14 2021 Brian Read <brianr@bjsystems.co.uk> 0.2-2.sme
 - Initial Import to SME10 [SME: 11324]
+- Update-Createlinks-for-systemd.patch
 
 * Mon Nov 11 2013 Daniel B. <daniel@firewall-services.com> - 0.2-1.sme
 - Rebuild for SME9
@@ -70,6 +90,11 @@ configuration
 %prep
 
 %setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 # Build symlinks
@@ -81,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
          > %{name}-%{version}-%{release}-filelist
 
+chmod +x %{buildroot}/sbin/e-smith/systemd/bridge-run
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,9 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %post
 
 %preun
-if [ $1 = 0 ] ; then
-  /etc/rc.d/init.d/bridge stop >& /dev/null || :
-fi
+#if [ $1 = 0 ] ; then
+#  /etc/rc.d/init.d/bridge stop >& /dev/null || :
+#fi
 
 true