--- rpms/smeserver-durep/contribs8/smeserver-durep-1.3.0.spec 2012/08/31 05:18:28 1.2 +++ rpms/smeserver-durep/contribs8/smeserver-durep-1.3.0.spec 2013/06/20 20:51:28 1.6 @@ -6,21 +6,36 @@ Name: %{name} %define version 1.3.0 Version: %{version} -%define release 2 +%define release 6 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 Group: Networking/Daemons Summary: DUREP - Graphic Report for Disk Usage -Requires: Perl(Dumper) -Requires: Perl(MLDBM) >= 1.21-4 +Requires: perl(Data::Dumper) +Requires: perl(MLDBM) >= 1.21-4 +Obsoletes: smeserver-durep-saco +Obsoletes: e-smith-durep + %changelog -* Fri Aug 31 2012 JP Pialasse 1.3.0-2.sme -- build error fix +* Thu Sep 13 2012 JP Pialasse 1.3.0-6.sme +- add Obsoletes smeserver-durep-saco e-smith-durep [SME 7108] +- TODO cleaning spec file post and filelist chmod + +* Mon Sep 10 2012 JP Pialasse 1.3.0-5.sme +- fix do not copy files and filelist [SME 7098] +- patch df of plugged disk + +* Sun Sep 09 2012 JP Pialasse 1.3.0-4.sme +- dependencies resolution + +* Fri Aug 31 2012 JP Pialasse 1.3.0-3.sme +- build error fix : prep setup * Wed Aug 15 2012 JP Pialasse 1.3.0-1.sme - update from 1.03-02sn to comply with SME8 and SME7 @@ -31,14 +46,19 @@ Requires: Perl(MLDBM) >= 1.21-4 %description 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) @@ -57,7 +77,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 @@ -65,7 +87,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