redhat spec file updates

diff --git a/AUTHORS b/AUTHORS
index 71a032b78c466e19ba0dc5d02cbc0b8f0120724b..c3bfe2761f7f8be35daf3309f61cf89e9304b613 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,3 +25,4 @@ ale -- ldap cleanup
 Sami Haahtinen <ressu@ressukka.net>
 Matthew Palmer -- mysql enhancements
 romain.tartiere@healthgrid.org -- ldap fixes
+Adam Monsen - spec file updates

diff --git a/ChangeLog b/ChangeLog
index 24e7e38a8c2c70ee105313c7f12e22469a7f5e71..fab6fca55fbf35b57e387622c0ae698df6297511 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,4 @@
 version 0.9.5 -- unreleased
-    ninjareport
-        . Added first draft of method to aggregate reports from many servers into
-          one email. Requires logtail, rsync, configuration of reporthost,
-          reportdirectory and reportuser in backupninja.conf. Configure cron to
-          run once a day, and individual backupninjas not to report by email their
-          status, then enjoy one email report from all hosts, rather than multiple
     backupninja changes
         . Fixed checks on configuration files permissions, since the patch
           applied to fix #370396 broke this, especially for configuration files
@@ -79,8 +73,15 @@ version 0.9.5 -- unreleased
         . Force C locale for sfdisk to ensure english words are found in grep
         . Make directory where output is placed configurable, and create the parent dir 
           if it doesn't exist (Closes: Trac#1)
+    ninjareport
+        . Added first draft of method to aggregate reports from many servers into
+          one email. Requires logtail, rsync, configuration of reporthost,
+          reportdirectory and reportuser in backupninja.conf. Configure cron to
+          run once a day, and individual backupninjas not to report by email their
+          status, then enjoy one email report from all hosts, rather than multiple
     fixed 'make install' bug that failed if /etc/backup.d already existed
     changed spaces to tabs in Makefile.am
+    updated redhat spec file (thanks Adam Monsen)
     
 
 version 0.9.4 -- October 6th, 2006

diff --git a/backupninja.spec.in b/backupninja.spec.in
index 0887691a02bffb0061611b6d611a9301ff6301f4..8ea716a6981231a72a6e1b3086dc11f636510517 100644 (file)
--- a/backupninja.spec.in
+++ b/backupninja.spec.in
@@ -19,15 +19,14 @@ Prefix:     %{_prefix}
 Modular rdiff.backup tool
 
 %prep
-#rm -rf ${buildroot}
 %setup -q
 
 %build
 %configure
-# this is necessary MAKEINSTALL rewrites @sysconfigdir@ atc.
-%{__make}
+make
 
 %install
+rm -rf ${buildroot}
 %makeinstall
 mkdir -p "%{buildroot}%{_sysconfdir}/backup.d"
 mkdir -p "%{buildroot}%{_localstatedir}/backups"
@@ -35,7 +34,7 @@ mkdir -p "%{buildroot}%{_localstatedir}/log"
 touch "%{buildroot}%{_localstatedir}/log/backupninja.log"
 
 %clean
-#rm -fr %{buildroot}
+rm -fr %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -60,5 +59,7 @@ touch "%{buildroot}%{_localstatedir}/log/backupninja.log"
 
 
 %changelog
+* Sun Oct 14 2007 Adam Monsen <haircut@gmail.com> 0.9.4-1
+- use cleanup steps during %install and %clean
 * Mon Apr 29 2002 Petr Klima <Petr.Klima@madeta-group.cz> 0.7.0
 - first RPM release