--- rpms/smeserver-durep/contribs10/smeserver-durep.spec	2020/10/23 11:45:26	1.2
+++ rpms/smeserver-durep/contribs10/smeserver-durep.spec	2022/05/18 23:58:44	1.9
@@ -1,4 +1,4 @@
-# $Id: smeserver-durep.spec,v 1.1 2020/10/23 10:38:16 brianr Exp $
+# $Id: smeserver-durep.spec,v 1.8 2022/01/08 18:07:44 michel Exp $
 # Authority: unnilennnium
 # Name: JP Pialasse
 
@@ -6,7 +6,7 @@
 Name:          %{name}
 %define version 1.5.0
 Version:       %{version}
-%define release 5
+%define release 12
 Release:       %{release}%{?dist}
 License:       GPL
 Source:  %{name}-%{version}.tar.gz
@@ -14,6 +14,12 @@ Source:  %{name}-%{version}.tar.gz
 Patch0: smeserver-durep-1.5.0-bz10118-more_paths.patch
 Patch1: smeserver-durep-1.5.0-dfposix.patch
 Patch2: smeserver-durep-1.5.0-Add-creatlinks-to-alter-link-to-wrapper.patch
+Patch3: smeserver-durep-1.5.0-bz10893-noreboot.patch
+Patch4: smeserver-durep-1.5.0-permissions.patch
+Patch5: smeserver-durep-1.5.0-manager2.patch
+Patch6: smeserver-durep-1.5.0-Add-class-to-div-for-AdminLTE.patch
+Patch7: smeserver-durep-1.5.0-bz11841_localisation_dir.patch
+Patch8: smeserver-durep-1.5.0-bz11975.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-buildroot
 BuildRequires: e-smith-devtools
@@ -25,8 +31,31 @@ Requires:      perl(MLDBM) >= 1.21-4
 Obsoletes:    smeserver-durep-saco
 Obsoletes:      e-smith-durep
 
+AutoReqProv: no
 
 %changelog
+* Wed May 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.5.0-12.sme
+- allow access to user with userpanel [SME: 11975]
+
+* Sat Jan 08 2022 Michel Begue <mab974@misouk.com> 1.5.0-11.sme
+- fix wrong localisation directory [SME: 11841]
+
+* Fri Jan 07 2022 Brian Read <brianr@bjsystems.co.uk> 1.5.0-10.sme
+- Add-class-to-div-for-AdminLTE [SME: 11835]
+
+* Thu Jun 03 2021 Michel Begue <mab974@gmail.com> 1.5.0-9.sme
+- first use with smeserver-manager [SME: 11618]
+
+* Thu Mar 04 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.5.0-8.sme
+- fix permissions of cgi inside spec file too 
+
+* Thu Mar 04 2021 Michel Begue <mab974@gmail.com> 1.5.0-7.sme
+- fix permissions of cgi and data files
+
+* Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.5.0-6.sme
+- add smeserver-durep-update event [SME: 10893]
+  make up spec file
+
 * Fri Oct 23 2020 Brian Read <brianr@bjsystems.co.uk> 1.5.0-5.sme
 - Initial import to SME10 tree [SME: 10893]
 - Add in link to wrapper in createlinks
@@ -72,6 +101,12 @@ DUREP is a  Report Generator that create
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 perl createlinks
@@ -80,7 +115,11 @@ perl createlinks
 /bin/rm -rf $RPM_BUILD_ROOT
 (cd root;  /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
 /bin/rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+	--file "/usr/local/bin/durep" 'attr(0755,root,root)'  \
+	--file "/usr/sbin/durep.daily" 'attr(0755,root,root)' \
+	--file '/etc/e-smith/web/panels/manager/html/durep/durep.cgi' 'attr(0750,root,admin)' \
+> %{name}-%{version}-filelist
 
 
 %clean
@@ -89,36 +128,11 @@ perl createlinks
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
 
-#%attr(0644 root root) "/etc/e-smith/templates/etc/crontab/durep"
-#%attr(4750 root admin) "/etc/e-smith/web/functions/durep"
-#%attr(0777 root root) "/etc/e-smith/web/panels/manager/cgi-bin/durep"
-#%attr(0644 root root) "/usr/local/bin/durep"
-#%dir %attr(0755 root root) "/usr/local/man"
-#%dir %attr(0755 root root) "/usr/local/man/man1"
-#%attr(0644 root root) "/usr/local/man/man1/durep.1"
-#%dir %attr(0755 root root) "/usr/sbin"
-#%attr(0644 root root) "/usr/sbin/durep.daily"
-#%dir %attr(0755 root root) "/var/lib/durep"
-#%dir %attr(0755 root root) "/etc/e-smith/web/panels/manager/html/durep"
-#%attr(0644 root root) "/etc/e-smith/web/panels/manager/html/durep/bar.png"
-#%attr(0644 root root) "/etc/e-smith/web/panels/manager/html/durep/durep.cgi"
-#%attr(0644 root root) "/etc/e-smith/web/panels/manager/html/durep/style.css"
-
 %pre -p /bin/sh
 
 %post -p /bin/sh
-chmod 755 /usr/local/bin/durep
-chmod 755 /usr/sbin/durep.daily
-/sbin/e-smith/expand-template /etc/crontab
-echo "Initial run of durep ... please wait."
-/usr/sbin/durep.daily >/dev/null
-/etc/e-smith/events/actions/navigation-conf >/dev/null 2>&1
 
 %preun -p /bin/sh
 
 %postun -p /bin/sh
-if [ "$1" = 0 ]; then
-    /sbin/e-smith/expand-template /etc/crontab
-    /etc/e-smith/events/actions/navigation-conf 2>/dev/null
-fi