[rsnapshot/f19] Added pod2man patch and fixed bad changelog dates that become errors in f19 and later.

Steven Roberts strobert at fedoraproject.org
Tue Jul 9 09:48:53 UTC 2013


commit 0c464d4948285b7ed49cbe1688340a90f3f1802e
Author: Steven Roberts <strobert at strobe.net>
Date:   Tue Jul 9 02:19:40 2013 -0700

    Added pod2man patch and fixed bad changelog dates that become
    errors in f19 and later.

 pod2man.patch  |   12 ++++++++++++
 rsnapshot.spec |   16 ++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/pod2man.patch b/pod2man.patch
new file mode 100644
index 0000000..d9ec257
--- /dev/null
+++ b/pod2man.patch
@@ -0,0 +1,12 @@
+diff -up rsnapshot-1.3.1/rsnapshot-program.pl.pod2man rsnapshot-1.3.1/rsnapshot-program.pl
+--- rsnapshot-1.3.1/rsnapshot-program.pl.pod2man	2013-07-06 00:39:44.500520483 -0700
++++ rsnapshot-1.3.1/rsnapshot-program.pl	2013-07-06 00:43:17.696767540 -0700
+@@ -6666,6 +6666,8 @@ additional disk space will be taken up.
+ 
+ =back
+ 
++=back
++
+ Remember that tabs must separate all elements, and that
+ there must be a trailing slash on the end of every directory.
+ 
diff --git a/rsnapshot.spec b/rsnapshot.spec
index 72ab6c2..4061044 100644
--- a/rsnapshot.spec
+++ b/rsnapshot.spec
@@ -6,7 +6,7 @@
 
 Name:           rsnapshot
 Version:        1.3.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Local and remote filesystem snapshot utility
 Group:          Applications/System
 License:        GPLv2+
@@ -17,7 +17,10 @@ BuildArch:      noarch
 # This patch enables a few defaults in the config file that make sense to have
 # enabled in linux.
 Patch0:         rsnapshot.conf.patch
-Patch1:		rsnapshot-fix-include-conf.patch
+Patch1:         rsnapshot-fix-include-conf.patch
+# Fixes a =back missing in the POD.  also addressed upstream in post 1.3.1
+#  so once new version comes out this can go away
+Patch2:         pod2man.patch
 BuildRequires:  rsync
 BuildRequires:  openssh-clients
 Requires:       openssh-clients
@@ -31,6 +34,7 @@ filesystems.  It uses hard links to save space on disk.
 %setup -q
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1 -b .pod2man
 
 # 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.
@@ -89,6 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jul 09 2013 Steven Roberts <strobert at strobe.net> - 1.3.1-9
+- fixed invalid changelog dates
+- added pod2man patch to deal with missing-back now error in newer fedora
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -128,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 * 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
+* Sun 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
@@ -144,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
 * 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>
+* Sat Jan 29 2005 Nathan Rosenquist <nathan at rsnapshot.org>
 - Added upgrade script
 
 * Sat Jan 22 2005 Nathan Rosenquist <nathan at rsnapshot.org>


More information about the scm-commits mailing list