[packages/offlineimap] up to 6.5.7
atler
atler at pld-linux.org
Sat May 16 12:38:17 CEST 2015
commit 381c4c53cbb10a2ab25ca15a861a7b0ed9717a95
Author: Jan Palus <atler at pld-linux.org>
Date: Sat May 16 12:36:32 2015 +0200
up to 6.5.7
- no_uidplus no longer needed
- package new offlineimapui.7 man page
- unconditionally include non-generated docs
offlineimap-no_uidplus.patch | 93 --------------------------------------------
offlineimap.spec | 21 +++++-----
2 files changed, 10 insertions(+), 104 deletions(-)
---
diff --git a/offlineimap.spec b/offlineimap.spec
index 4405309..742ccb0 100644
--- a/offlineimap.spec
+++ b/offlineimap.spec
@@ -3,14 +3,13 @@
Summary: Mailboxes synchronization tool
Summary(pl.UTF-8): Narzędzie do synchroniczacji skrzynek pocztowych
Name: offlineimap
-Version: 6.5.6
-Release: 2
+Version: 6.5.7
+Release: 1
License: GPL v2
Group: Applications/Mail
Source0: http://github.com/OfflineIMAP/%{name}/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
-# Source0-md5: b595561eb2050767c376df3b92aa0d74
+# Source0-md5: b6c933bd89d037fca9037d2f6bd18a37
Patch0: %{name}-docs.patch
-Patch1: %{name}-no_uidplus.patch
URL: https://offlineimap.org
BuildRequires: rpm-pythonprov >= 4.1-13
%if %{with doc}
@@ -45,12 +44,10 @@ połączenia.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%if %{with doc}
-%{__make} doc
-%{__make} man
+%{__make} -C docs
%endif
%install
@@ -63,8 +60,9 @@ find $RPM_BUILD_ROOT%{py_sitescriptdir} -type f -name "*.py" | xargs rm
install %{name}.py $RPM_BUILD_ROOT%{_bindir}/%{name}
%if %{with doc}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_mandir}/man7}
+install docs/%{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install docs/offlineimapui.7 $RPM_BUILD_ROOT%{_mandir}/man7
%endif
%clean
@@ -72,10 +70,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc offlineimap.conf*
+%doc CONTRIBUTING.rst Changelog.md MAINTAINERS.rst README.md offlineimap.conf*
%if %{with doc}
-%doc Changelog.html README.md docs/html/*.html
+%doc docs/html/*.html
%{_mandir}/man1/offlineimap.1*
+%{_mandir}/man7/offlineimapui.7*
%endif
%attr(755,root,root) %{_bindir}/*
%{py_sitescriptdir}/%{name}
diff --git a/offlineimap-no_uidplus.patch b/offlineimap-no_uidplus.patch
deleted file mode 100644
index 90ef91f..0000000
--- a/offlineimap-no_uidplus.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py
-index 43e79ff..bca52a2 100644
---- a/offlineimap/folder/Base.py
-+++ b/offlineimap/folder/Base.py
-@@ -413,16 +413,26 @@ def deletemessageslabels(self, uidlist, labels):
-
- """
-
-- def addmessageheader(self, content, headername, headervalue):
-+ def addmessageheader(self, content, crlf, headername, headervalue):
-+ """
-+ Adds new header to the provided message.
-+
-+ Arguments:
-+ - content: message content, headers and body as a single string
-+ - crlf: string that carries line ending
-+ - headername: name of the header to add
-+ - headervalue: value of the header to add
-+
-+ """
- self.ui.debug('',
- 'addmessageheader: called to add %s: %s' % (headername,
- headervalue))
-- prefix = '\n'
-+ prefix = crlf
- suffix = ''
-- insertionpoint = content.find('\n\n')
-+ insertionpoint = content.find(crlf + crlf)
- if insertionpoint == 0 or insertionpoint == -1:
- prefix = ''
-- suffix = '\n'
-+ suffix = crlf
- if insertionpoint == -1:
- insertionpoint = 0
- # When body starts immediately, without preceding '\n'
-@@ -430,8 +440,8 @@ def addmessageheader(self, content, headername, headervalue):
- # we seen many broken ones), we should add '\n' to make
- # new (and the only header, in this case) to be properly
- # separated from the message body.
-- if content[0] != '\n':
-- suffix = suffix + '\n'
-+ if content[0:len(crlf)] != crlf:
-+ suffix = suffix + crlf
-
- self.ui.debug('', 'addmessageheader: insertionpoint = %d' % insertionpoint)
- headers = content[0:insertionpoint]
-diff --git a/offlineimap/folder/Gmail.py b/offlineimap/folder/Gmail.py
-index f051938..2a598de 100644
---- a/offlineimap/folder/Gmail.py
-+++ b/offlineimap/folder/Gmail.py
-@@ -93,7 +93,7 @@ def getmessage(self, uid):
- labels = set()
- labels = labels - self.ignorelabels
- labels_str = imaputil.format_labels_string(self.labelsheader, sorted(labels))
-- body = self.addmessageheader(body, self.labelsheader, labels_str)
-+ body = self.addmessageheader(body, '\n', self.labelsheader, labels_str)
-
- if len(body)>200:
- dbg_output = "%s...%s" % (str(body)[:150], str(body)[-50:])
-diff --git a/offlineimap/folder/GmailMaildir.py b/offlineimap/folder/GmailMaildir.py
-index 3f37b02..be0d20d 100644
---- a/offlineimap/folder/GmailMaildir.py
-+++ b/offlineimap/folder/GmailMaildir.py
-@@ -141,7 +141,7 @@ def savemessagelabels(self, uid, labels, ignorelabels=set()):
- # Change labels into content
- labels_str = imaputil.format_labels_string(self.labelsheader,
- sorted(labels | ignoredlabels))
-- content = self.addmessageheader(content, self.labelsheader, labels_str)
-+ content = self.addmessageheader(content, '\n', self.labelsheader, labels_str)
- rtime = self.messagelist[uid].get('rtime', None)
-
- # write file with new labels to a unique file in tmp
-diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
-index 4801eef..3b506e5 100644
---- a/offlineimap/folder/IMAP.py
-+++ b/offlineimap/folder/IMAP.py
-@@ -526,6 +526,7 @@ def savemessage(self, uid, content, flags, rtime):
- # NB: imapobj to None.
- try:
- while retry_left:
-+ # XXX: we can mangle message only once, out of the loop
- # UIDPLUS extension provides us with an APPENDUID response.
- use_uidplus = 'UIDPLUS' in imapobj.capabilities
-
-@@ -535,7 +536,7 @@ def savemessage(self, uid, content, flags, rtime):
- content)
- self.ui.debug('imap', 'savemessage: header is: %s: %s' %\
- (headername, headervalue))
-- content = self.addmessageheader(content, headername, headervalue)
-+ content = self.addmessageheader(content, CRLF, headername, headervalue)
-
- if len(content)>200:
- dbg_output = "%s...%s" % (content[:150], content[-50:])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/offlineimap.git/commitdiff/381c4c53cbb10a2ab25ca15a861a7b0ed9717a95
More information about the pld-cvs-commit
mailing list