--- 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/01/24 11:54:43 1.6 @@ -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.5 2021/01/23 08:57:29 brianr Exp $ # Authority: vip-ire # Name: Daniel Berteaud %define version 0.2 -%define release 2 +%define release 5 %define name smeserver-bridge-interface @@ -27,6 +27,10 @@ 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 + %description This package allows you to replace the internal interface with a bridge interface (and the original internal interface enslaved to it). @@ -34,8 +38,15 @@ It's usefull for OpenVPN in bridge mode configuration %changelog +* Sun Jan 24 2021 Brian Read 0.2-5.sme +- Add-Restart-to-service-file.patch [SME: 11324 ] + +* Sat Jan 23 2021 Brian Read 0.2-4.sme +- Move exec to /sbin/e-smith/systemd/bridge-run, add service file [SME: 11324] + * Thu Jan 14 2021 Brian Read 0.2-2.sme - Initial Import to SME10 [SME: 11324] +- Update-Createlinks-for-systemd.patch * Mon Nov 11 2013 Daniel B. - 0.2-1.sme - Rebuild for SME9 @@ -70,6 +81,9 @@ configuration %prep %setup -q -n %{name}-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build # Build symlinks @@ -81,6 +95,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 +108,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