--- rpms/e-smith-LPRng/sme10/e-smith-LPRng.spec	2020/09/22 10:04:13	1.3
+++ rpms/e-smith-LPRng/sme10/e-smith-LPRng.spec	2021/02/13 04:46:05	1.7
@@ -1,16 +1,19 @@
-# $Id: e-smith-LPRng.spec,v 1.2 2016/05/12 21:07:16 vip-ire Exp $
+# $Id: e-smith-LPRng.spec,v 1.6 2020/12/10 09:26:41 michel Exp $
 
 Summary: e-smith server and gateway - LPRng module
 %define name e-smith-LPRng
 Name: %{name}
 %define version 2.6.0
-%define release 3
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 Patch0: %{name}-%{version}-bz11006_systemd.patch
+Patch1: %{name}-%{version}-bz11006_systemd_bis.patch
+Patch2: %{name}-%{version}-remove_lpd_link_.patch
+Patch3: %{name}-%{version}-bz11006_LPRng_preset-bz11245_runit_required.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base, LPRng
 Requires: e-smith-lib >= 1.15.1-19
@@ -25,6 +28,20 @@ e-smith server and gateway software - LP
 Add printing features, using the LPRng package.
 
 %changelog
+* Fri Feb 12 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- remove /usr/lib/systemd/system-preset/80-koozali-LPRng.preset [SME: 10958]
+
+* Thu Dec 10 2020 Michel Begue <mab974@gmail.com> 2.6.0-6.sme
+- Add 'Requires:runit.service' [SME: 11245]
+- Add a fragment for lpd in 49-koozali.preset [SME: 11006]
+
+* Thu Nov 19 2020 Michel Begue <mab974@gmail.com> 2.6.0-5.sme
+- Remove init.d/supervise/lpd link [SME: 11006]
+
+* Wed Nov 11 2020 Michel Begue <mab974@gmail.com> 2.6.0-4.sme
+- keep runit service for systemd [SME: 11006]
+- fix update event name [SME: 11007]
+
 * Sat Sep 05 2020 Michel Begue <mab974@gmail.com> 2.6.0-3.sme
 - from service to systemd [SME: 11006]
 - add lpd-update event [SME: 11007]
@@ -499,7 +516,7 @@ Add printing features, using the LPRng p
   merged configuration/services hash to esmith::cgi
   functions.
 
-* Thu Oct 06 2000 Tony Clayton <tonyc@e-smith.com>
+* Fri Oct 06 2000 Tony Clayton <tonyc@e-smith.com>
 - Fixed require dependency (was e-smith-lib >= 1.0-21)
 
 * Fri Oct 06 2000 Adrian Chung <adrian.chung@e-smith.com>
@@ -507,10 +524,10 @@ Add printing features, using the LPRng p
   for now in e-smith-base.
 - Added require dependency for e-smith-lib.
 
-* Tue Oct 04 2000 Adrian Chung <adrian.chung@e-smith.com>
+* Wed Oct 04 2000 Adrian Chung <adrian.chung@e-smith.com>
 - Changed restart action to use serviceControl(restart).
 
-* Tue Oct 04 2000 Adrian Chung <adrian.chung@e-smith.com>
+* Wed Oct 04 2000 Adrian Chung <adrian.chung@e-smith.com>
 - Changed so that templates are only expanded if service is enabled.
 
 * Tue Oct 03 2000 Charlie Brady <charlieb@e-smith.com>
@@ -550,6 +567,9 @@ Add printing features, using the LPRng p
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks
@@ -557,9 +577,10 @@ perl createlinks
  
 %install
 rm -rf $RPM_BUILD_ROOT
-(cd root ; find . -depth -print | egrep -v "var\/service" | cpio -dump $RPM_BUILD_ROOT)
+(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 rm -f %{name}-%{version}-%{release}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --file /var/service/lpd/run 'attr(0755,root,root)' \
     > %{name}-%{version}-%{release}-filelist
 echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
 
@@ -571,4 +592,3 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
-%attr(0755,root,root) /usr/lib/systemd/systemd-lpd