rpms/rsnapshot/FC-4 rsnapshot.conf.patch, 1.3, 1.4 rsnapshot.spec, 1.9, 1.10 sources, 1.7, 1.8
Chris Petersen (xris)
fedora-extras-commits at redhat.com
Tue Jul 18 06:52:33 UTC 2006
Author: xris
Update of /cvs/extras/rpms/rsnapshot/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4308
Modified Files:
rsnapshot.conf.patch rsnapshot.spec sources
Log Message:
Enough time has gone by for 1.2.9 with no trouble (and bug reports about 1.2.3 not working, so I'm pushing 1.2.9 to stable
rsnapshot.conf.patch:
Index: rsnapshot.conf.patch
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/FC-4/rsnapshot.conf.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rsnapshot.conf.patch 21 May 2006 04:26:27 -0000 1.3
+++ rsnapshot.conf.patch 18 Jul 2006 06:52:33 -0000 1.4
@@ -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/FC-4/rsnapshot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rsnapshot.spec 21 May 2006 04:26:27 -0000 1.9
+++ rsnapshot.spec 18 Jul 2006 06:52:33 -0000 1.10
@@ -3,7 +3,7 @@
#
Name: rsnapshot
-Version: 1.2.3
+Version: 1.2.9
Release: 2%{?dist}
Summary: Local and remote filesystem snapshot utility
@@ -71,6 +71,9 @@
# Rename the installed .default config file to a usable name
mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf
+# Change the perms on the utils/ files so rpm doesn't pick up their dependencies
+find utils/ -type f -print0 | xargs -r0 chmod 644
+
################################################################################
%post
@@ -117,6 +120,12 @@
%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
+
* Wed May 17 2006 Chris Petersen <rpm at forevermore.net> 1.2.3-2
- Add rsync and openssh-clients build requirements because the configure script checks for them.
- Remove perl requirement because it's detected by rpm.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 21 May 2006 04:26:27 -0000 1.7
+++ sources 18 Jul 2006 06:52:33 -0000 1.8
@@ -1 +1 @@
-b27d90886b25d0e160b267f98c605aec rsnapshot-1.2.3.tar.gz
+68632bc6cdd9c149e0fdeb9e246622d3 rsnapshot-1.2.9.tar.gz
More information about the scm-commits
mailing list