[backup-manager] Upstream 0.7.10

Guillaume Kulakowski llaumgui at fedoraproject.org
Sun Dec 26 14:29:11 UTC 2010


commit 7057f87d2dded2cd230c55de5c8d27bc95e37fe7
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date:   Sun Dec 26 15:28:42 2010 +0100

    Upstream 0.7.10

 .gitignore                                         |    1 +
 ...nfigtpl.patch => backup-manager-configtpl.patch |    8 ++--
 backup-manager.spec                                |   39 +++++++++++++++-----
 sources                                            |    2 +-
 4 files changed, 36 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de6c67c..515dbb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 backup-manager-0.7.9.tar.gz
+/backup-manager-0.7.10.tar.gz
diff --git a/backup-manager-0.7.9-configtpl.patch b/backup-manager-configtpl.patch
similarity index 67%
rename from backup-manager-0.7.9-configtpl.patch
rename to backup-manager-configtpl.patch
index 1f01221..7b4bb85 100644
--- a/backup-manager-0.7.9-configtpl.patch
+++ b/backup-manager-configtpl.patch
@@ -1,15 +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
+--- backup-manager/backup-manager.conf.tpl.configtpl
++++ backup-manager/backup-manager.conf.tpl
 @@ -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 327b932..aac9e0d 100644
--- a/backup-manager.spec
+++ b/backup-manager.spec
@@ -1,14 +1,15 @@
 Name:           backup-manager
-Version:        0.7.9
+Version:        0.7.10
 Release:        1%{?dist}
 Summary:        A command line backup tool for GNU/Linux
+Summary(fr):    Outil de sauvegarde en ligne de commande pour GNU/Linux
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.backup-manager.org
 Source0:        http://www.backup-manager.org/download/%{name}-%{version}.tar.gz
 Source1:        %{name}.cron.daily
-Patch0:         %{name}-%{version}-configtpl.patch
+Patch0:         %{name}-configtpl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -40,7 +41,7 @@ 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
+you make daily archives of your file system. Written in bash and Perl, it can
 make archives in lots of open formats (tar, gzip, bzip2, lzma, dar, zip) and
 provides lots of interesting features (such as network exports or CD/DVD
 automated-burning).
@@ -49,6 +50,18 @@ The program is designed to be as easy to use as possible and is popular with
 desktop users and sysadmins. The whole backup process is defined in one
 full-documented configuration file which needs no more than 5 minutes to tune
 for your needs.
+%description -l fr
+Backup Manager est un outil de sauvegarde en ligne de commande, conçu pour vous
+aider dans la sauvegarde quotidienne de vos fichiers systèmes. Écrit en bash et
+en Perl il peut archiver sous plusieurs de formats (tar, gzip, bzip2, lzma,
+dar, zip) et fourni une liste intéressante de fonctionnalités (telle que
+l'export au travers du réseau ou la gravure sur CD/DVD).
+
+Ce programme est conçu pour être aussi simple que possible à utiliser autant
+par des utilisateurs lambdas que par des administrateurs système. Tout le
+processus de sauvegarder est défini dans un seul fichier de configuration
+parfaitement documenté, et qui prend moins de 5 minutes à configurer selon
+vos besoins.
 
 
 %prep
@@ -56,11 +69,13 @@ for your needs.
 %patch0 -p1 -b .configtpl
 
 # Clean Makefile
-sed -i -e "s at install --owner=root --group=root @install @" Makefile
+sed -i -e "s at install -o root -g 0 @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/user-guide*; do sed -i -e "s@#!/bin/sh@#!/bin/bash@" "$file"; done
+# rpmlint W: file-not-utf8
+for file in  ChangeLog THANKS; do
+    iconv -f ISO_8859-1 -t UTF-8 -o ${file}{.utf8,}
+    mv ${file}{.utf8,}
+done;
 
 
 %build
@@ -95,7 +110,7 @@ chmod 755 %{buildroot}%{_datadir}/%{name}/sanitize.sh
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS
+%doc AUTHORS ChangeLog COPYING NEWS README THANKS
 %{_bindir}/%{name}-purge
 %{_bindir}/%{name}-upload
 %{_sbindir}/%{name}
@@ -108,7 +123,13 @@ chmod 755 %{buildroot}%{_datadir}/%{name}/sanitize.sh
 
 
 %changelog
-* Wed Jul 14 2010 Stepan Kasal <skasal at redhat.com> - 0.7.9-1
+* Sun Dec 26 2010 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.10-1
+- Upstream 0.7.10
+- Remove old sed in SPEC file
+- Remove version from path0
+- Add French translation
+
+* Wed Jul 14 2010 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 0.7.9-1
 - Upstream 0.7.9
 
 * Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 0.7.8-7
diff --git a/sources b/sources
index cc0e359..deda535 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb8e79429ada947ae90f134d30d8e46e  backup-manager-0.7.9.tar.gz
+342a11d36fd73941fb8a4534fc602ac8  backup-manager-0.7.10.tar.gz


More information about the scm-commits mailing list