--- rpms/smeserver-durep/contribs8/smeserver-durep-1.3.0.spec 2012/09/10 03:52:38 1.4 +++ rpms/smeserver-durep/contribs8/smeserver-durep-1.3.0.spec 2012/09/11 05:40:56 1.5 @@ -6,10 +6,11 @@ Name: %{name} %define version 1.3.0 Version: %{version} -%define release 4 +%define release 5 Release: %{release}%{?dist} License: GPL Source: %{name}-%{version}.tgz +Patch1: smeserver-durep-1.3.0-df.patch BuildRoot: /var/tmp/%{name}-%{version}-buildroot BuildRequires: e-smith-devtools BuildArch: noarch @@ -19,6 +20,10 @@ Requires: perl(Data::Dumper) Requires: perl(MLDBM) >= 1.21-4 %changelog +* Mon Sep 10 2012 JP Pialasse 1.3.0-5.sme +- fix do not copy files and filelist +- patch df of plugged disk + * Sun Sep 09 2012 JP Pialasse 1.3.0-4.sme - dependencies resolution @@ -35,16 +40,18 @@ Requires: perl(MLDBM) >= 1.21-4 DUREP is a Report Generator that creates graphical Output for the "du" command %prep - %setup +%patch1 -p1 %install -rm -rf $RPM_BUILD_ROOT -( find . -depth -print | cpio -dump $RPM_BUILD_ROOT) -rm -f %{name}-%{version}-filelist +/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 + + %clean -rm -rf $RPM_BUILD_ROOT +/bin/rm -rf $RPM_BUILD_ROOT %files -f %{name}-%{version}-filelist %defattr(-,root,root) @@ -63,7 +70,9 @@ rm -rf $RPM_BUILD_ROOT #%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 @@ -71,7 +80,9 @@ chmod 755 /usr/sbin/durep.daily 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