--- rpms/smeserver-durep/contribs10/smeserver-durep.spec 2020/10/23 10:38:16 1.1 +++ rpms/smeserver-durep/contribs10/smeserver-durep.spec 2021/02/22 19:02:29 1.3 @@ -1,4 +1,4 @@ -# $Id: smeserver-durep.spec,v 1.5 2019/12/28 19:10:45 jpp Exp $ +# $Id: smeserver-durep.spec,v 1.2 2020/10/23 11:45:26 brianr Exp $ # Authority: unnilennnium # Name: JP Pialasse @@ -6,12 +6,16 @@ Name: %{name} %define version 1.5.0 Version: %{version} -%define release 4 +%define release 6 Release: %{release}%{?dist} License: GPL 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 + BuildRoot: /var/tmp/%{name}-%{version}-buildroot BuildRequires: e-smith-devtools BuildArch: noarch @@ -24,6 +28,14 @@ Obsoletes: e-smith-durep %changelog +* Mon Feb 22 2021 Jean-Philipe Pialasse 1.5.0-6.sme +- add smeserver-durep-update event [SME: 10893] + make up spec file + +* Fri Oct 23 2020 Brian Read 1.5.0-5.sme +- Initial import to SME10 tree [SME: 10893] +- Add in link to wrapper in createlinks + * Sat Dec 28 2019 Jean-Philipe Pialasse 1.5.0-4.sme - output all mounted points with df on one line using Posix @@ -64,12 +76,20 @@ DUREP is a Report Generator that create %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +%build +perl createlinks %install /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)' \ +> %{name}-%{version}-filelist %clean @@ -78,36 +98,11 @@ DUREP is a Report Generator that create %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