rpms/rsnapshot/devel rsnapshot.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rsnapshot.spec, 1.1, 1.2 sources, 1.2, 1.3

[Gavin Henry (ghenry)]

Author: ghenry

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

Modified Files:
	.cvsignore rsnapshot.spec sources 
Added Files:
	rsnapshot.patch 
Log Message:
auto-import rsnapshot-1.2.1-1 on branch devel from rsnapshot-1.2.1-1.src.rpm
Initial rsnapshot import

rsnapshot.patch:

--- NEW FILE rsnapshot.patch ---
--- rsnapshot.conf.default.in	2005-04-03 06:58:02.000000000 -0700
+++ rsnapshot.conf.default.in.redhat	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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Mar 2005 13:03:19 -0000	1.2
+++ .cvsignore	12 Apr 2005 11:07:19 -0000	1.3
@@ -1 +1 @@
-rsnapshot-1.1.4.tar.gz
+rsnapshot-1.2.1.tar.gz


Index: rsnapshot.spec
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/rsnapshot.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsnapshot.spec	18 Mar 2005 13:03:19 -0000	1.1
+++ rsnapshot.spec	12 Apr 2005 11:07:19 -0000	1.2
@@ -1,75 +1,86 @@
-Name: rsnapshot
-Summary: Local and remote filesystem snapshot utility
-Version: 1.1.4
-Release: 0.fdr.2
-BuildArch: noarch
-License: GPL
-Group: Applications/System
-URL: http://www.rsnapshot.org
-Source: http://www.rsnapshot.org/downloads/rsnapshot-1.1.4.tar.gz
-# Configure script checks for rsync, so we need it in order to build
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: perl, rsync
-Requires: perl, openssh-clients, rsync, /usr/bin/logger, /bin/cp, /bin/rm
+Name:           rsnapshot
+Summary:        Local and remote filesystem snapshot utility
+Version:        1.2.1
+Release:        1
+License:        GPL
+Group:          Applications/System
+Url:            http://www.rsnapshot.org
+Source0:        http://www.rsnapshot.org/downloads/rsnapshot-1.2.1.tar.gz
+Patch0:         rsnapshot.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       perl, rsync, ssh
+AutoReqProv:    no
 
 %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.
+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
-perl -p -i -e "s#/usr/local/bin/rsnapshot#%{_bindir}/rsnapshot#" rsnapshot.1
+rm -rf %{buildroot}
+
+%setup 
+
+%patch
 
 %build
-%configure --with-rsync=%{_bindir}/rsync --with-ssh=%{_bindir}/ssh \
-	--with-logger=%{_bindir}/logger --with-cp=/bin/cp \
-	--with-rm=/bin/rm --with-perl=%{_bindir}/perl
+%configure
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -m 755 rsnapshot $RPM_BUILD_ROOT%{_bindir}/rsnapshot
+install -d %{buildroot}/%{_bindir}
+install -m 755 rsnapshot %{buildroot}/%{_bindir}/rsnapshot
+
+install -d %{buildroot}/%{_mandir}/man1
+install -m 644 rsnapshot.1 %{buildroot}/%{_mandir}/man1/
+
+install -d %{buildroot}/%{_sysconfdir}
+install -m 644 rsnapshot.conf.default %{buildroot}/%{_sysconfdir}/rsnapshot.conf.default
+install -m 600 rsnapshot.conf.default %{buildroot}/%{_sysconfdir}/rsnapshot.conf
+
+%post
+#
+# upgrade rsnapshot config file
+#
+RSNAPSHOT_CONFIG_VERSION=`%{_bindir}/rsnapshot check-config-version`
+if test $? != 0; then
+	echo "Error upgrading %{_sysconfdir}/rsnapshot.conf"
+fi
+
+if test "$RSNAPSHOT_CONFIG_VERSION" = "1.2"; then
+	# already latest version
+	exit 0
+fi
+
+if test "$RSNAPSHOT_CONFIG_VERSION" = "unknown"; then
+	%{_bindir}/rsnapshot upgrade-config-file
+	RETVAL=$?
+	exit $RETVAL
+fi
 
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 644 rsnapshot.1 $RPM_BUILD_ROOT%{_mandir}/man1
+echo "Error upgrading %{_sysconfdir}/rsnapshot.conf. Config format unknown!"
+exit 1
 
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 644 rsnapshot.conf.default $RPM_BUILD_ROOT%{_sysconfdir}/rsnapshot.conf.default
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README TODO
-%config %{_sysconfdir}/rsnapshot.conf.default
-%{_bindir}/rsnapshot
-%{_mandir}/man1/rsnapshot.1*
+%verify(user group mode md5 size mtime) %doc AUTHORS COPYING ChangeLog README INSTALL TODO
+%verify(user group mode md5 size mtime) %config %{_sysconfdir}/rsnapshot.conf.default
+%verify(user group mode) %config(noreplace) %{_sysconfdir}/rsnapshot.conf
+%verify(user group mode md5 size mtime) %{_bindir}/rsnapshot
+%verify(user group mode md5 size mtime) %{_mandir}/man1/rsnapshot.1*
 
 %changelog
-* Mon Jun 15 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.4-0.fdr.2
-- added rsync to buildrequires
+* Tue Apr 12 2005 Gavin Henry <ghenry at suretecsystems.com>
+- Cleaned up a lot and imported to Fedora Extras
 
-* Mon Jun 7 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.4-0.fdr.1
-- updated to latest upstream release
+* Sun Jan 29 2005 Nathan Rosenquist <nathan at rsnapshot.org>
+- Added upgrade script
 
-* Fri Jun 4 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.1-0.fdr.3
-- changed buildroot to fedora spec
-- removed /etc/rsnapshot.conf
-
-* Thu Jun 3 2004 Erik S. LaBianca <erik at ilsw.com>  1.1.1-0.fdr.2
-- changed buildroot 
-- removed explicit perl dep, added /usr/bin/logger
-- changed %configure arguments to macros
-- fixed rm -rf locations, removed %verify verbosity, empty %post
-- replaced rsnapshot references in man page with correct location
-- removed INSTALL from %doc
-
-* Mon Feb 16 2004 Erik S. LaBianca <erik at totalcirculation.com>
-- Converted to Fedora packaging guidelines for fedora.us submission
-- changed release to 0.fdr.1
-- removed AutoReqProv: no
-- replaced hardcoded paths with macros
+* 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rsnapshot/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Mar 2005 13:03:19 -0000	1.2
+++ sources	12 Apr 2005 11:07:19 -0000	1.3
@@ -1 +1 @@
-938a065a0da619d7d94908dc9374b63c  rsnapshot-1.1.4.tar.gz
+b126ae490889e5514f4a5d14a1128897  rsnapshot-1.2.1.tar.gz