Mailinglist Archive: opensuse-commit (1826 mails)

< Previous

Next >

Hello community,

here is the log from the commit of package rsnapshot
checked in at Mon Sep 8 16:30:47 CEST 2008.

--------
--- rsnapshot/rsnapshot.changes 2007-11-12 12:10:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/rsnapshot/rsnapshot.changes 2008-09-08
14:37:19.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Sep 8 14:35:07 CEST 2008 - hvogel@xxxxxxx
+
+- Update to 1.3.1
+ * Fix help message mixup in lines between -c and -t
+ * Allow named pipe as logfile
+ * Include rsnapshot-copy script
+ * Allow `backticks` in include_conf.
+ * hopefully fix bug with link_dest not being used on second and
+ later backups when you have link_dest 1 and sync_first 1
+ * Added stop_on_stale_lockfile
+ * Added multi-line config options
+ * The 'interval' config option is now called 'retain'
+
+-------------------------------------------------------------------

Old:
----
rsnapshot-1.3.0.tar.bz2
rsnapshot-man-page.patch

New:
----
rsnapshot-1.3.1-no_usr_local.patch
rsnapshot-1.3.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ rsnapshot.spec ++++++
--- /var/tmp/diff_new_pack.U18296/_old 2008-09-08 16:30:06.000000000 +0200
+++ /var/tmp/diff_new_pack.U18296/_new 2008-09-08 16:30:06.000000000 +0200
@@ -1,25 +1,33 @@
#
-# spec file for package rsnapshot (Version 1.3.0)
+# spec file for package rsnapshot (Version 1.3.1)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild

+
Name: rsnapshot
Url: http://www.rsnapshot.org/
License: GPL v2 or later
Group: Productivity/Archiving/Backup
-Version: 1.3.0
-Release: 85
+Version: 1.3.1
+Release: 1
Summary: Backup program using hardlinks
Source: %name-%version.tar.bz2
Patch1: rsnapshot-config.patch
-Patch2: rsnapshot-man-page.patch
+Patch2: rsnapshot-1.3.1-no_usr_local.patch
BuildRequires: perl rsync
Requires: perl rsync
AutoReqProv: on
@@ -48,7 +56,7 @@
Teodor Zlatanov <tzz@xxxxxxxxxxxxxxxxxxxxx>

%prep
-%setup
+%setup -q
%patch1
%patch2

@@ -73,19 +81,32 @@
%config(noreplace) %{_sysconfdir}/rsnapshot.conf
%config %{_sysconfdir}/rsnapshot.conf.default
%doc AUTHORS COPYING ChangeLog README INSTALL TODO
-%doc %{_mandir}/man1/rsnapshot.1.gz
+%{_mandir}/man1/rsnapshot.1.gz
+%{_mandir}/man1/rsnapshot-diff.1.gz
+
%changelog
-* Thu Aug 16 2007 - guru@xxxxxxxxxxx
+* Mon Sep 08 2008 hvogel@xxxxxxx
+- Update to 1.3.1
+ * Fix help message mixup in lines between -c and -t
+ * Allow named pipe as logfile
+ * Include rsnapshot-copy script
+ * Allow `backticks` in include_conf.
+ * hopefully fix bug with link_dest not being used on second and
+ later backups when you have link_dest 1 and sync_first 1
+ * Added stop_on_stale_lockfile
+ * Added multi-line config options
+ * The 'interval' config option is now called 'retain'
+* Fri Aug 17 2007 guru@xxxxxxxxxxx
- added call to make test
- now requires perl-lchown
- changed sync_first configuration to default (0) instead of 1:
http://www.linux-club.de/ftopic78019.html
-* Wed May 23 2007 - mskibbe@xxxxxxx
+* Wed May 23 2007 mskibbe@xxxxxxx
- fix path to binary in man and info pages
-* Mon Jan 15 2007 - mskibbe@xxxxxxx
+* Mon Jan 15 2007 mskibbe@xxxxxxx
- update to version 1.3.0 which
o fix some bugs
o includes some new and updated man-pages
o includes more examples
o Change "Perhaps this is not GNU cp?" error message
-* Fri Jul 07 2006 - mskibbe@xxxxxxx
+* Fri Jul 07 2006 mskibbe@xxxxxxx
- create package

++++++ rsnapshot-1.3.1-no_usr_local.patch ++++++
--- Makefile.am
+++ Makefile.am
@@ -60,7 +60,7 @@
perl -pi -e 's/^\#\@CMD_DU\@/\@CMD_DU\@/'
rsnapshot.conf.default.in.redhat
perl -pi -e 's/^\#logfile/logfile/' rsnapshot.conf.default.in.redhat
perl -pi -e 's/^\#lockfile/lockfile/' rsnapshot.conf.default.in.redhat
- perl -pi -e 's%^\#cmd_rsnapshot_diff
/usr/local/bin/rsnapshot-diff%cmd_rsnapshot_diff
/usr/bin/rsnapshot-diff%' rsnapshot.conf.default.in.redhat
+ perl -pi -e 's%^\#cmd_rsnapshot_diff
/usr/bin/rsnapshot-diff%cmd_rsnapshot_diff /usr/bin/rsnapshot-diff%'
rsnapshot.conf.default.in.redhat
@# diff doesn't return 0
diff -u rsnapshot.conf.default.in rsnapshot.conf.default.in.redhat >
redhat/SOURCES/rsnapshot.patch || /bin/true
rm -f rsnapshot.conf.default.in.redhat
--- Makefile.in
+++ Makefile.in
@@ -593,7 +593,7 @@
perl -pi -e 's/^\#\@CMD_DU\@/\@CMD_DU\@/'
rsnapshot.conf.default.in.redhat
perl -pi -e 's/^\#logfile/logfile/' rsnapshot.conf.default.in.redhat
perl -pi -e 's/^\#lockfile/lockfile/' rsnapshot.conf.default.in.redhat
- perl -pi -e 's%^\#cmd_rsnapshot_diff
/usr/local/bin/rsnapshot-diff%cmd_rsnapshot_diff
/usr/bin/rsnapshot-diff%' rsnapshot.conf.default.in.redhat
+ perl -pi -e 's%^\#cmd_rsnapshot_diff
/usr/bin/rsnapshot-diff%cmd_rsnapshot_diff /usr/bin/rsnapshot-diff%'
rsnapshot.conf.default.in.redhat
@# diff doesn't return 0
diff -u rsnapshot.conf.default.in rsnapshot.conf.default.in.redhat >
redhat/SOURCES/rsnapshot.patch || /bin/true
rm -f rsnapshot.conf.default.in.redhat
--- rsnapshot-program.pl
+++ rsnapshot-program.pl
@@ -6547,7 +6547,7 @@

B<backup> lvm://vg0/home/path2/ lvm-vg0/

-B<backup_script> /usr/local/bin/backup_pgsql.sh pgsql_backup/
+B<backup_script> /usr/bin/backup_pgsql.sh pgsql_backup/

=over 4

@@ -6631,7 +6631,7 @@
=back

-B<backup_script /usr/local/bin/backup_database.sh db_backup/>
+B<backup_script /usr/bin/backup_database.sh db_backup/>

=over 4

@@ -6706,7 +6706,7 @@

backup /etc/ localhost/
backup /home/ localhost/
- backup_script /usr/local/bin/backup_mysql.sh mysql_backup/
+ backup_script /usr/bin/backup_mysql.sh mysql_backup/

backup root@xxxxxxx:/etc/ foo.com/
backup root@xxxxxxx:/home/ foo.com/
@@ -6733,13 +6733,13 @@

=over 4

-B<0 */4 * * * /usr/local/bin/rsnapshot hourly>
+B<0 */4 * * * /usr/bin/rsnapshot hourly>

-B<50 23 * * * /usr/local/bin/rsnapshot daily>
+B<50 23 * * * /usr/bin/rsnapshot daily>

-B<40 23 * * 6 /usr/local/bin/rsnapshot weekly>
+B<40 23 * * 6 /usr/bin/rsnapshot weekly>

-B<30 23 1 * * /usr/local/bin/rsnapshot monthly>
+B<30 23 1 * * /usr/bin/rsnapshot monthly>

=back

@@ -6833,13 +6833,13 @@

=over 4

-B<0 */4 * * * /usr/local/bin/rsnapshot sync &&
/usr/local/bin/rsnapshot hourly>
+B<0 */4 * * * /usr/bin/rsnapshot sync && /usr/bin/rsnapshot hourly>

-B<50 23 * * * /usr/local/bin/rsnapshot daily>
+B<50 23 * * * /usr/bin/rsnapshot daily>

-B<40 23 1,8,15,22 * * /usr/local/bin/rsnapshot weekly>
+B<40 23 1,8,15,22 * * /usr/bin/rsnapshot weekly>

-B<30 23 1 * * /usr/local/bin/rsnapshot monthly>
+B<30 23 1 * * /usr/bin/rsnapshot monthly>

=back

--- rsnapshot.1
+++ rsnapshot.1
@@ -611,7 +611,7 @@
.Sp
\&\fBbackup\fR lvm://vg0/home/path2/ lvm\-vg0/
.Sp
-\&\fBbackup_script\fR /usr/local/bin/backup_pgsql.sh pgsql_backup/
+\&\fBbackup_script\fR /usr/bin/backup_pgsql.sh pgsql_backup/
.Sp
.RS 4
Examples:
@@ -693,7 +693,7 @@
.RE
.RS 4
.Sp
-\&\fBbackup_script /usr/local/bin/backup_database.sh db_backup/\fR
+\&\fBbackup_script /usr/bin/backup_database.sh db_backup/\fR
.Sp
.RS 4
In this example, we specify a script or program to run. This script should
simply
@@ -782,7 +782,7 @@
.Vb 3
\& backup /etc/ localhost/
\& backup /home/ localhost/
-\& backup_script /usr/local/bin/backup_mysql.sh mysql_backup/
+\& backup_script /usr/bin/backup_mysql.sh mysql_backup/
.Ve
.Sp
.Vb 5
@@ -810,13 +810,13 @@
\&\fBdaily\fR, \fBweekly\fR and \fBmonthly\fR have been defined in
\fB/etc/rsnapshot.conf\fR
.Sp
.RS 4
-\&\fB0 */4 * * * /usr/local/bin/rsnapshot hourly\fR
+\&\fB0 */4 * * * /usr/bin/rsnapshot hourly\fR
.Sp
-\&\fB50 23 * * * /usr/local/bin/rsnapshot daily\fR
+\&\fB50 23 * * * /usr/bin/rsnapshot daily\fR
.Sp
-\&\fB40 23 * * 6 /usr/local/bin/rsnapshot weekly\fR
+\&\fB40 23 * * 6 /usr/bin/rsnapshot weekly\fR
.Sp
-\&\fB30 23 1 * * /usr/local/bin/rsnapshot monthly\fR
+\&\fB30 23 1 * * /usr/bin/rsnapshot monthly\fR
.RE
.RE
.RS 4
@@ -909,13 +909,13 @@
the lowest, most frequent backup level, and right before. For example:
.Sp
.RS 4
-\&\fB0 */4 * * * /usr/local/bin/rsnapshot sync &&
/usr/local/bin/rsnapshot hourly\fR
+\&\fB0 */4 * * * /usr/bin/rsnapshot sync && /usr/bin/rsnapshot
hourly\fR
.Sp
-\&\fB50 23 * * * /usr/local/bin/rsnapshot daily\fR
+\&\fB50 23 * * * /usr/bin/rsnapshot daily\fR
.Sp
-\&\fB40 23 1,8,15,22 * * /usr/local/bin/rsnapshot weekly\fR
+\&\fB40 23 1,8,15,22 * * /usr/bin/rsnapshot weekly\fR
.Sp
-\&\fB30 23 1 * * /usr/local/bin/rsnapshot monthly\fR
+\&\fB30 23 1 * * /usr/bin/rsnapshot monthly\fR
.RE
.RE
.RS 4
--- utils/rsnapshot_if_mounted.sh
+++ utils/rsnapshot_if_mounted.sh
@@ -26,13 +26,13 @@
# Edit this script so it points to your rsnapshot program and snapshot root.
# Then simply call this script instead of rsnapshot.
#
-# Example: /usr/local/bin/rsnapshot_if_mounted.sh -v daily
+# Example: /usr/bin/rsnapshot_if_mounted.sh -v daily
##############################################################################

# $Id: rsnapshot_if_mounted.sh,v 1.4 2005/04/02 07:37:07 scubaninja Exp $

# path to rsnapshot
-RSNAPSHOT=/usr/local/bin/rsnapshot
+RSNAPSHOT=/usr/bin/rsnapshot

# snapshot_root
SNAPSHOT_ROOT=/.snapshots/;
++++++ rsnapshot-1.3.0.tar.bz2 -> rsnapshot-1.3.1.tar.bz2 ++++++
++++ 4358 lines of diff (skipped)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1826 mails)

commit rsnapshot

Search this list

List Navigation

This Thread