rpms/rsnapshot/devel .cvsignore, 1.6, 1.7 rsnapshot.spec, 1.12, 1.13 sources, 1.6, 1.7

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/rsnapshot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11614

Modified Files:
	.cvsignore rsnapshot.spec sources 
Log Message:
fix license tag, update to 1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rsnapshot/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 May 2007 20:28:52 -0000	1.6
+++ .cvsignore	3 Sep 2008 21:08:44 -0000	1.7
@@ -1 +1 @@
-rsnapshot-1.3.0.tar.gz
+rsnapshot-1.3.1.tar.gz


Index: rsnapshot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rsnapshot/devel/rsnapshot.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rsnapshot.spec	28 May 2007 20:28:52 -0000	1.12
+++ rsnapshot.spec	3 Sep 2008 21:08:44 -0000	1.13
@@ -5,56 +5,35 @@
 #
 
 Name:           rsnapshot
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        Local and remote filesystem snapshot utility
-
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 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
-
-################################################################################
-
+Patch0:         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
+%patch0 -p0
 
-%patch
-
-# Disable the config-file testing during ./configure because it freaks out if
+# 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}"             \
@@ -63,10 +42,7 @@
     --with-logger="%{_bindir}/logger"   \
     --with-du="%{_bindir}/du"
 
-################################################################################
-
 %install
-
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
@@ -76,10 +52,7 @@
 # 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
-
 %define logmsg logger -t %{name}/rpm
 
 # Get the version of the current rsnapshot config file so we can see if it
@@ -101,16 +74,11 @@
         exit 1
     fi
 
-################################################################################
-
 %clean
-
 rm -rf $RPM_BUILD_ROOT
 
-################################################################################
-
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING INSTALL README TODO
 %doc rsnapshot.conf.default
 %doc utils/
@@ -118,9 +86,11 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
-################################################################################
-
 %changelog
+* Wed Sep  3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.3.1-1
+- fix license tag
+- update to 1.3.1
+- remove comment lines (more trouble than they're worth)
 
 * Mon May 28 2007 Chris Petersen <rpm at forevermore.net>                  1.3.0-1
 - Upgrade to 1.3.0
@@ -144,8 +114,8 @@
 * 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
+- 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rsnapshot/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 May 2007 20:28:52 -0000	1.6
+++ sources	3 Sep 2008 21:08:44 -0000	1.7
@@ -1 +1 @@
-8487514517e78fe1cd1143ca67cb4b62  rsnapshot-1.3.0.tar.gz
+588f92995dcf60a6ea6df8d94a017e7e  rsnapshot-1.3.1.tar.gz