rpms/rsnapshot/devel rsnapshot.conf.patch, 1.1, 1.2 rsnapshot.spec, 1.8, 1.9

[Chris Petersen (xris)]

Author: xris

Update of /cvs/extras/rpms/rsnapshot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26116

Modified Files:
	rsnapshot.conf.patch rsnapshot.spec 
Log Message:
update patch to work with 1.2.9

rsnapshot.conf.patch:

Index: rsnapshot.conf.patch
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.conf.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsnapshot.conf.patch	19 May 2006 23:34:16 -0000	1.1
+++ rsnapshot.conf.patch	25 May 2006 17:26:46 -0000	1.2
@@ -1,38 +1,43 @@
---- rsnapshot.conf.default.in	2005-04-03 06:58:02.000000000 -0700
-+++ rsnapshot.conf.default.in.fedora	2005-04-03 06:58:11.000000000 -0700
-@@ -40,7 +40,7 @@
- #
- # See the README file or the man page for more details.
+--- rsnapshot.conf.default.in.orig	2006-05-25 10:21:10.000000000 -0700
++++ rsnapshot.conf.default.in	2006-05-25 10:23:49.000000000 -0700
+@@ -39,13 +39,7 @@
+ # LINUX USERS:   Be sure to uncomment "cmd_cp". This gives you extra features.
+ # EVERYONE ELSE: Leave "cmd_cp" commented out for compatibility.
  #
+-# Note: Linux users with gnu cp/coreutils version > 5.3, should leave
+-# cmd_cp commented out, since cp fails to create destination directories
+-# with a trailing slash for versions 5.3 or later.
+-#
+-# See the README file or the man page for more details.
+-#
 -#@CMD_CP@
 + at CMD_CP@
  
  # uncomment this to use the rm program instead of the built-in perl routine.
- @CMD_RM@
-@@ -55,7 +55,7 @@
- @CMD_LOGGER@
- 
- # Uncomment this to specify a path to "du" for disk usage checks.
+ #
+@@ -68,7 +62,7 @@
+ # If you have an older version of "du", you may also want to check the
+ # "du_args" parameter below.
+ #
 -#@CMD_DU@
 + at CMD_DU@
  
- #########################################
- #           BACKUP INTERVALS            #
-@@ -94,7 +94,7 @@
- 
+ # Uncomment this to specify the path to rsnapshot-diff.
+ #
+@@ -117,14 +111,14 @@
  # If you enable this, data will be written to the file you specify. The
  # amount of data written is controlled by the "loglevel" parameter.
+ #
 -#logfile	/var/log/rsnapshot
 +logfile	/var/log/rsnapshot
  
- # The include and exclude parameters, if enabled, simply get passed directly
- # to rsync. If you have multiple include/exclude patterns, put each one on a
-@@ -138,7 +138,7 @@
+ # If enabled, rsnapshot will write a lockfile to prevent two instances
+ # from running simultaneously (and messing up the snapshot_root).
  # If you enable this, make sure the lockfile directory is not world
  # writable. Otherwise anyone can prevent the program from running.
  #
 -#lockfile	/var/run/rsnapshot.pid
 +lockfile	/var/run/rsnapshot.pid
  
- # If enabled, rsnapshot will move the oldest directory for each interval
- # to [interval_name].delete, then it will delete that directory as a 
+ # Default rsync args. All rsync commands have at least these options set.
+ #


Index: rsnapshot.spec
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rsnapshot.spec	25 May 2006 07:22:41 -0000	1.8
+++ rsnapshot.spec	25 May 2006 17:26:46 -0000	1.9
@@ -4,7 +4,7 @@
 
 Name:           rsnapshot
 Version:        1.2.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Local and remote filesystem snapshot utility
 
 Group:          Applications/System
@@ -120,6 +120,9 @@
 
 %changelog
 
+* Thu May 25 2006 Chris Petersen <rpm at forevermore.net>                  1.2.9-2
+- Update configfile patch to work with 1.2.9
+
 * Sat May 21 2006 Chris Petersen <rpm at forevermore.net>                  1.2.9-1
 - Preliminary build for 1.2.9