rpms/rsnapshot/FC-5 Makefile, 1.4, 1.5 rsnapshot.conf.patch, 1.2, 1.3 rsnapshot.spec, 1.8, 1.9 sources, 1.6, 1.7 .cvsignore, 1.3, 1.4

[Chris Petersen (xris)]

Author: xris

Update of /cvs/extras/rpms/rsnapshot/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25936

Modified Files:
	.cvsignore 
Added Files:
	Makefile rsnapshot.conf.patch rsnapshot.spec sources 
Log Message:
second try to get 1.2.3 and an actual file put into fc5


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	21 May 2006 04:14:28 -0000	1.5
@@ -0,0 +1,21 @@
+# Makefile for source rpm: rsnapshot
+# $Id$
+NAME := rsnapshot
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

rsnapshot.conf.patch:

Index: rsnapshot.conf.patch
===================================================================
RCS file: rsnapshot.conf.patch
diff -N rsnapshot.conf.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsnapshot.conf.patch	21 May 2006 04:14:28 -0000	1.3
@@ -0,0 +1,38 @@
+--- 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.
+ #
+-#@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.
+-#@CMD_DU@
++ at CMD_DU@
+ 
+ #########################################
+ #           BACKUP INTERVALS            #
+@@ -94,7 +94,7 @@
+ 
+ # 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 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 


Index: rsnapshot.spec
===================================================================
RCS file: rsnapshot.spec
diff -N rsnapshot.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ rsnapshot.spec	21 May 2006 04:14:28 -0000	1.9
@@ -0,0 +1,161 @@
+#
+# Specfile for rsnapshot
+#
+
+Name:           rsnapshot
+Version:        1.2.3
+Release:        2
+Summary:        Local and remote filesystem snapshot utility
+
+Group:          Applications/System
+License:        GPL
+URL:            http://www.rsnapshot.org/
+
+################################################################################
+
+Source:         http://www.rsnapshot.org/downloads/%{name}-%{version}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+
+################################################################################
+
+# This patch enables a few defaults in the config file that make sense to have
+# enabled in linux.
+Patch:          rsnapshot.conf.patch
+
+################################################################################
+
+BuildRequires:  rsync
+BuildRequires:  openssh-clients
+
+Requires:       openssh-clients
+Requires:       rsync
+
+################################################################################
+
+%description
+This is a remote backup program that uses rsync to take backup snapshots of
+filesystems.  It uses hard links to save space on disk.
+
+################################################################################
+
+%prep
+
+%setup -q
+
+%patch
+
+# Disable the config-file testing during ./configure because it freaks out if
+# you're building as non-root on a system that actually has rsnapshot installed.
+sed -ie 's|if test -e "\$RSNAPSHOT_SYSCONFDIR/rsnapshot.conf"|if false|' configure
+
+################################################################################
+
+%build
+%configure                              \
+    --with-perl="%{__perl}"             \
+    --with-rsync="%{_bindir}/rsync"     \
+    --with-ssh="%{_bindir}/ssh"         \
+    --with-logger="%{_bindir}/logger"   \
+    --with-du="%{_bindir}/du"
+
+################################################################################
+
+%install
+
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Rename the installed .default config file to a usable name
+mv $RPM_BUILD_ROOT/etc/rsnapshot.conf.default $RPM_BUILD_ROOT/etc/rsnapshot.conf
+
+################################################################################
+
+%post
+
+%define logmsg logger -t %{name}/rpm
+
+# Get the version of the current rsnapshot config file so we can see if it
+# needs to be upgraded.
+    CONF_VERSION="$(%{_bindir}/rsnapshot check-config-version 2>/dev/null)"
+    if [ $? != 0 ]; then
+        %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf."
+    fi
+
+# Old version in need of an upgrade
+    if [ "$CONF_VERSION" == "unknown" ]; then
+        %{_bindir}/rsnapshot upgrade-config-file
+        exit $?
+    fi
+
+# Latest version is 1.2, so anything else is not good.
+    if [ "$CONF_VERSION" != "1.2" ]; then
+        %logmsg "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!"
+        exit 1
+    fi
+
+################################################################################
+
+%clean
+
+rm -rf $RPM_BUILD_ROOT
+
+################################################################################
+
+%files
+%defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING INSTALL README TODO
+%doc rsnapshot.conf.default
+%doc utils/
+%config(noreplace) %{_sysconfdir}/rsnapshot.conf
+%{_bindir}/*
+%{_mandir}/man1/*
+
+################################################################################
+
+%changelog
+
+* 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.
+
+* Wed May 17 2006 Chris Petersen <rpm at forevermore.net>                  1.2.3-1
+- Update to version 1.2.3 which is in the downloads directory but not linked on the site.
+- Change openssh requirement to openssh-clients
+- Update %post script with better info from the rpmforge spec and nifty logger reports
+- Add utils/ to the %doc files
+
+* Sat May 13 2006 Chris Petersen <rpm at forevermore.net>                  1.2.1-1
+- Update specfile to be compatible with fedora guidelines
+
+* Sun Jan 29 2005 Nathan Rosenquist <nathan at rsnapshot.org>
+- Added upgrade script
+
+* Sat Jan 22 2005 Nathan Rosenquist <nathan at rsnapshot.org>
+- Added --with-du option
+
+* Thu Jan 15 2004 Nathan Rosenquist <nathan at rsnapshot.org>
+- Added "AutoReqProv: no" for SuSE compatibility
+
+* Fri Dec 26 2003 Nathan Rosenquist <nathan at rsnapshot.org>
+- Added util-linux dependency, and --with-logger= option
+
+* Fri Dec 19 2003 Nathan Rosenquist <nathan at rsnapshot.org>
+- now fully support autoconf
+
+* Tue Dec 16 2003 Nathan Rosenquist <nathan at rsnapshot.org>
+- changed rsnapshot.conf to rsnapshot.conf.default from the source tree
+
+* Wed Nov 05 2003 Nathan Rosenquist <nathan at rsnapshot.org>
+- Removed fileutils dependency, added verification info
+
+* Tue Nov 04 2003 Nathan Rosenquist <nathan at rsnapshot.org>
+- fixed anonymous rsync error
+
+* Thu Oct 30 2003 Nathan Rosenquist <nathan at rsnapshot.org>
+- update to 1.0.3
+
+* Tue Oct 28 2003 Carl Wilhelm Soderstrom <chrome at real-time.com>
+- created spec file


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	21 May 2006 04:14:28 -0000	1.7
@@ -0,0 +1 @@
+b27d90886b25d0e160b267f98c605aec  rsnapshot-1.2.3.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Apr 2005 11:07:19 -0000	1.3
+++ .cvsignore	21 May 2006 04:14:28 -0000	1.4
@@ -1 +1 @@
-rsnapshot-1.2.1.tar.gz
+rsnapshot-1.2.3.tar.gz