From 1b2b1a5882f6cf55597e2fbe8907a05a37131c38 Mon Sep 17 00:00:00 2001 From: Guillaume Kulakowski Date: Feb 08 2009 18:03:59 +0000 Subject: Update to 0.7.8 --- diff --git a/.cvsignore b/.cvsignore index da8621d..37f0a9c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -backup-manager-0.7.7.tar.gz +backup-manager-0.7.8.tar.gz diff --git a/backup-manager-0.7.8-configtpl.patch b/backup-manager-0.7.8-configtpl.patch new file mode 100644 index 0000000..1f01221 --- /dev/null +++ b/backup-manager-0.7.8-configtpl.patch @@ -0,0 +1,15 @@ +--- backup-manager-0.7.7/backup-manager.conf.tpl.configtpl 2008-04-14 19:58:43.000000000 +0200 ++++ backup-manager-0.7.7/backup-manager.conf.tpl 2009-01-15 19:52:38.000000000 +0100 +@@ -12,8 +12,11 @@ + # Repository - everything about where archives are + ############################################################# + ++# RPM-specific : Enabled daily cron ++export BM_DAILY_CRON="false" ++ + # Where to store the archives +-export BM_REPOSITORY_ROOT="/var/archives" ++export BM_REPOSITORY_ROOT="/var/backup-manager" + + # Where to place temporary files + export BM_TEMP_DIR="/tmp" diff --git a/backup-manager.spec b/backup-manager.spec index f0d8f48..29bc4c9 100644 --- a/backup-manager.spec +++ b/backup-manager.spec @@ -1,6 +1,6 @@ Name: backup-manager -Version: 0.7.7 -Release: 7%{?dist} +Version: 0.7.8 +Release: 1%{?dist} Summary: A command line backup tool for GNU/Linux Group: Applications/System @@ -27,7 +27,6 @@ Requires: diffutils Requires: dvd+rw-tools Requires: less Requires: ftp -Requires: genisoimage Requires: gettext Requires: gnupg Requires: gzip @@ -38,7 +37,6 @@ Requires: tar Requires: which - %description Backup Manager is a command line backup tool for GNU/Linux, designed to help you make daily archives of your file system. Written in bash and perl, it can @@ -52,7 +50,6 @@ full-documented configuration file which needs no more than 5 minutes to tune for your needs. - %prep %setup -q %patch0 -p1 -b .configtpl @@ -62,7 +59,7 @@ sed -i -e "s@install --owner=root --group=root @install @" Makefile # Replace #!/bin/sh by #!/bin/bash for file in t/*.sh; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done -for file in doc/*; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done +for file in doc/user-guide*; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done # rpmlint : Convert to utf-8 for file in AUTHORS ChangeLog COPYING NEWS README THANKS; do @@ -72,17 +69,16 @@ for file in AUTHORS ChangeLog COPYING NEWS README THANKS; do done - %build make %{?_smp_mflags} - %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} \ - PERL5DIR=%{buildroot}%{perl_vendorlib} - INSTALL="install -p" +make install \ + DESTDIR=%{buildroot} \ + PERL5DIR=%{buildroot}%{perl_vendorlib} \ + INSTALL="install -p" %find_lang %{name} # Create backup directory @@ -90,7 +86,7 @@ install -d %{buildroot}%{_localstatedir}/%{name} # Copy configuration install -p -D -m 0644 %{buildroot}%{_datadir}/%{name}/%{name}.conf.tpl \ - %{buildroot}%{_sysconfdir}/%{name}.conf + %{buildroot}%{_sysconfdir}/%{name}.conf # Add cron.daily install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.daily/%{name}.cron @@ -99,12 +95,10 @@ install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.daily/%{name}.c chmod 755 %{buildroot}%{_datadir}/%{name}/sanitize.sh - %clean rm -rf %{buildroot} - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README THANKS @@ -119,8 +113,11 @@ rm -rf %{buildroot} %{_localstatedir}/%{name} - %changelog +* Sat Feb 07 2009 Guillaume Kulakowski - 0.7.8-1 +- Update to 0.7.8 +- Remove genisoimage requirement + * Thu Jan 15 2009 Guillaume Kulakowski - 0.7.7-7 - Replace some sed by a patch - Replace /bin/sh by /bin/bash diff --git a/sources b/sources index 3bd126c..66b03dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -076af845dee01453f450bd06d021fcc3 backup-manager-0.7.7.tar.gz +0a044ced8822d14b3792a546eb447d69 backup-manager-0.7.8.tar.gz