- do the files

Changed files:
    collectl.spec -> 1.2

diff --git a/collectl.spec b/collectl.spec
index 1af7cc491777b27e9a8b343bf3bbc2823ad533d3..bc3deee395346c99fe6c0f104a1d75cf7e22628c 100644 (file)
--- a/collectl.spec
+++ b/collectl.spec
@@ -1,3 +1,4 @@
+%include       /usr/lib/rpm/macros.perl
 Summary:       A utility to collect various linux performance data
 Name:          collectl
 Version:       2.4.3
@@ -5,7 +6,12 @@ Release:       0.1
 License:       Artistic, GPL
 Group:         Applications/System
 Source0:       http://dl.sourceforge.net/collectl/%{name}-%{version}-src.tar.gz
+# Source0-md5: bcb74b5677e4b5a494ebe51f5e8d6710
 URL:           http://collectl.sourceforge.net
+BuildRequires: perl-devel >= 1:5.8.0
+BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: sed >= 4.0
+Requires:      perl-base >= 1:5.8.0
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -14,19 +20,26 @@ A utility to collect linux performance data.
 
 %prep
 %setup -q
-
-%build
-
-%clean
-rm -Rf $RPM_BUILD_ROOT
+%{__sed} -i -e 's,\r$,,' FAQ-collectl.html
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man1,/etc/rc.d/init.d,/var/log/%{name},%{_sysconfdir}}
+cp -a man1/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install initd/collectl $RPM_BUILD_ROOT/etc/rc.d/init.d
+install collectl.pl $RPM_BUILD_ROOT%{_sbindir}/collectl
+cp -a formatit.ph $RPM_BUILD_ROOT%{_sbindir} # XXX, move it out of sbindir, as not executable and not directly invokable
+cp -a collectl.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir}}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -d $RPM_BUILD_ROOT/var/log/%{name}
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc FAQ-collectl.html RELEASE-collectl
+%attr(754,root,root) /etc/rc.d/init.d/collectl
+%attr(755,root,root) %{_sbindir}/collectl
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/collectl.conf
+# XXX not executable
+%{_sbindir}/formatit.ph
+%{_mandir}/man1/*