diff --git a/.cvsignore b/.cvsignore index 37f0a9c..de6c67c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -backup-manager-0.7.8.tar.gz +backup-manager-0.7.9.tar.gz diff --git a/backup-manager-0.7.7-configtpl.patch b/backup-manager-0.7.7-configtpl.patch deleted file mode 100644 index 1f01221..0000000 --- a/backup-manager-0.7.7-configtpl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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-0.7.8-configtpl.patch b/backup-manager-0.7.8-configtpl.patch deleted file mode 100644 index 1f01221..0000000 --- a/backup-manager-0.7.8-configtpl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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-0.7.9-configtpl.patch b/backup-manager-0.7.9-configtpl.patch new file mode 100644 index 0000000..1f01221 --- /dev/null +++ b/backup-manager-0.7.9-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 976e795..327b932 100644 --- a/backup-manager.spec +++ b/backup-manager.spec @@ -1,6 +1,6 @@ Name: backup-manager -Version: 0.7.8 -Release: 4%{?dist} +Version: 0.7.9 +Release: 1%{?dist} Summary: A command line backup tool for GNU/Linux Group: Applications/System @@ -62,42 +62,35 @@ sed -i -e "s@install --owner=root --group=root @install @" Makefile for file in t/*.sh; 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 - mv $file timestamp - iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp - touch -r timestamp $file -done - %build -make %{?_smp_mflags} +%{__make} %{?_smp_mflags} %install -rm -rf %{buildroot} -make install \ +%{__rm} -rf %{buildroot} +%{__make} install \ DESTDIR=%{buildroot} \ PERL5DIR=%{buildroot}%{perl_vendorlib} \ INSTALL="install -p" %find_lang %{name} # Create backup directory -install -d %{buildroot}%{_localstatedir}/%{name} +%{__install} -d %{buildroot}%{_localstatedir}/%{name} # Copy configuration -install -p -D -m 0644 %{buildroot}%{_datadir}/%{name}/%{name}.conf.tpl \ +%{__install} -p -D -m 0644 %{buildroot}%{_datadir}/%{name}/%{name}.conf.tpl \ %{buildroot}%{_sysconfdir}/%{name}.conf # Add cron.daily -install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.daily/%{name}.cron +%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.daily/%{name}.cron # rpmlint : sanitize.sh is a non-executable-script chmod 755 %{buildroot}%{_datadir}/%{name}/sanitize.sh %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} %files -f %{name}.lang @@ -115,6 +108,18 @@ rm -rf %{buildroot} %changelog +* Wed Jul 14 2010 Stepan Kasal - 0.7.9-1 +- Upstream 0.7.9 + +* Tue Jun 01 2010 Marcela Maslanova - 0.7.8-7 +- Mass rebuild with perl-5.12.0 + +* Fri Dec 4 2009 Stepan Kasal - 0.7.8-6 +- rebuild against perl 5.10.1 + +* Fri Jul 24 2009 Fedora Release Engineering - 0.7.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Sun Jul 12 2009 Guillaume Kulakowski - 0.7.8-4 - Bump release @@ -125,7 +130,7 @@ rm -rf %{buildroot} - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild * Sat Feb 07 2009 Guillaume Kulakowski - 0.7.8-1 -- Update to 0.7.8 +- Upstream 0.7.8 - Remove genisoimage requirement * Thu Jan 15 2009 Guillaume Kulakowski - 0.7.7-7 diff --git a/sources b/sources index 66b03dd..cc0e359 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a044ced8822d14b3792a546eb447d69 backup-manager-0.7.8.tar.gz +cb8e79429ada947ae90f134d30d8e46e backup-manager-0.7.9.tar.gz