[offlineimap] Fix manpage formatting

Christoph Höger choeger at fedoraproject.org
Wed Oct 19 20:32:06 UTC 2011


commit 6182ee521b1ca3f7fd1f12c32531ec564ad024c4
Author: Christoph Höger <christoph.hoeger at tu-berlin.de>
Date:   Wed Oct 19 21:46:06 2011 +0200

    Fix manpage formatting
    
    Also implement rwmj's git patch trick:
    
    http://rwmj.wordpress.com/2011/08/09/nice-rpm-git-patch-management-trick/)
    
    Signed-off-by: Christoph Höger <christoph.hoeger at tu-berlin.de>

 ...-build-failures-from-inconsistent-heading.patch |   42 ++++++++++++++++++++
 offlineimap.spec                                   |   14 ++++++-
 2 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-manpage-build-failures-from-inconsistent-heading.patch b/0001-Fix-manpage-build-failures-from-inconsistent-heading.patch
new file mode 100644
index 0000000..c07e337
--- /dev/null
+++ b/0001-Fix-manpage-build-failures-from-inconsistent-heading.patch
@@ -0,0 +1,42 @@
+From c4320786ab78fca8bea5cd079c0596092c6ab602 Mon Sep 17 00:00:00 2001
+From: Thomas Kahle <tomka at gentoo.org>
+Date: Sat, 13 Aug 2011 13:05:11 +0100
+Subject: [PATCH] Fix manpage build failures from inconsistent heading
+
+Signed-off-by: Mark Foxwell <fastfret79 at archlinux.org.uk>
+Signed-off-by: Thomas Kahle <tomka at gentoo.org>
+Signed-off-by: Nicolas Sebrecht <nicolas.s-dev at laposte.net>
+---
+ docs/MANUAL.rst |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/docs/MANUAL.rst b/docs/MANUAL.rst
+index af5683f..8f09f92 100644
+--- a/docs/MANUAL.rst
++++ b/docs/MANUAL.rst
+@@ -380,7 +380,7 @@ mail.server -port 443" to find out the connection that is used by
+ default.
+ 
+ Certificate checking
+-^^^^^^^^^^^^^^^^^^^^
++--------------------
+ 
+ Unfortunately, by default we will not verify the certificate of an IMAP
+ TLS/SSL server we connect to, so connecting by SSL is no guarantee
+@@ -397,7 +397,7 @@ its expiration date. The FAQ contains an entry on how to create your own
+ certificate and CA certificate.
+ 
+ StartTLS
+-^^^^^^^^
++--------
+ 
+ If you have not configured your account to connect via SSL anyway,
+ OfflineImap will still attempt to set up an SSL connection via the
+@@ -410,4 +410,3 @@ contents. However, this will not protect you from active attacks, such
+ as Man-In-The-Middle attacks which cause you to connect to the wrong
+ server and pretend to be your mail server. DO NOT RELY ON STARTTLS AS A
+ SAFE CONNECTION GUARANTEEING THE AUTHENTICITY OF YOUR IMAP SERVER!
+-=======
+-- 
+1.7.6.4
+
diff --git a/offlineimap.spec b/offlineimap.spec
index 9d526cf..c1c1847 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -18,6 +18,8 @@ BuildRequires:  gzip
 
 BuildArch:      noarch
 
+Patch1: 0001-Fix-manpage-build-failures-from-inconsistent-heading.patch
+
 %description
 OfflineIMAP is a tool to simplify your e-mail reading. With OfflineIMAP,
 you can read the same mailbox from multiple computers.  You get a
@@ -28,9 +30,17 @@ computer as well. OfflineIMAP is also useful if you want to use a mail
 reader that does not have IMAP support, has poor IMAP support, or does
 not provide disconnected operation.
 
-
 %prep
-%setup -q -n %name-%version
+%setup -q -n %name-v%version
+# Create a git repo within the expanded tarball.
+# Credits to: 
+git init
+git config user.email "offlineimap-owner at fedoraproject.org"
+git config user.name "Offlineimap Maintainer"
+git add .
+git commit -a -q -m "%{version} baseline."
+# Apply all the patches on top.
+git am %{patches}
 
 %build
 make build


More information about the scm-commits mailing list