commit edb720e9f29ebfb7fe69d10c2952a018789a2b70
Author: Jan Rękorajski <[email protected]>
Date: Sun May 9 11:54:24 2021 +0200
- fix building man pages with sphinx 3.x
- rel 7
cyrus-imapd-sphinx3.patch | 37 +++++++++++++++++++++++++++++++++++++
cyrus-imapd.spec | 6 +++++-
2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 68a26cd..3ae4a61 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -18,7 +18,7 @@ Summary(pl.UTF-8): Wysoko wydajny serwer IMAP i POP3
Summary(pt_BR.UTF-8): Um servidor de mail de alto desempenho que suporta IMAP
e POP3
Name: cyrus-imapd
Version: 3.0.9
-Release: 6
+Release: 7
License: BSD-like
Group: Networking/Daemons/POP3
Source0: https://www.cyrusimap.org/releases/%{name}-%{version}.tar.gz
@@ -42,6 +42,7 @@ Patch3: %{name}-icu.patch
Patch4: %{name}-libcap.patch
Patch5: %{name}-gcc10.patch
Patch6: %{name}-sphinx2.patch
+Patch7: %{name}-sphinx3.patch
URL: http://www.cyrusimap.org/
BuildRequires: autoconf >= 2.63
BuildRequires: automake
@@ -211,9 +212,12 @@ Perlowy interfejs do biblioteki cyrus-imapd.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
cp -p %{SOURCE1} %{SOURCE2} %{SOURCE4} %{SOURCE5} .
+find docsrc/ -name '*.pyc' -print0 | xargs --null %{__rm}
+
%build
%{__libtoolize}
%{__aclocal} -I cmulocal
diff --git a/cyrus-imapd-sphinx3.patch b/cyrus-imapd-sphinx3.patch
new file mode 100644
index 0000000..7d6b454
--- /dev/null
+++ b/cyrus-imapd-sphinx3.patch
@@ -0,0 +1,37 @@
+--- cyrus-imapd-3.0.9/docsrc/exts/sphinxlocal/builders/manpage.py~
2021-05-09 11:36:01.000000000 +0200
++++ cyrus-imapd-3.0.9/docsrc/exts/sphinxlocal/builders/manpage.py
2021-05-09 11:41:39.266179918 +0200
+@@ -21,7 +21,6 @@
+ from sphinx import addnodes
+ from sphinx.errors import SphinxError
+ from sphinx.builders import Builder
+-from sphinx.environment import NoUri
+ from sphinx.util.nodes import inline_all_toctrees
+ from sphinx.util.console import bold, darkgreen
+ from sphinx.writers.manpage import ManualPageWriter
+--- cyrus-imapd-3.0.9/docsrc/exts/sphinxlocal/writers/manpage.py~
2021-05-09 11:36:01.000000000 +0200
++++ cyrus-imapd-3.0.9/docsrc/exts/sphinxlocal/writers/manpage.py
2021-05-09 11:48:57.416148611 +0200
+@@ -14,6 +14,7 @@
+
+ import docutils
+ from docutils import nodes
++from time import strftime
+ from sphinx.writers.manpage import (
+ ManualPageWriter,
+ ManualPageTranslator as BaseTranslator
+@@ -26,7 +27,6 @@
+
+ from sphinx import addnodes
+ from sphinx.locale import admonitionlabels, _
+-from sphinx.util.osutil import ustrftime
+
+ class CyrusManualPageWriter(ManualPageWriter):
+
+@@ -71,7 +71,7 @@
+ if builder.config.today:
+ self._docinfo['date'] = builder.config.today
+ else:
+- self._docinfo['date'] = ustrftime(builder.config.today_fmt
++ self._docinfo['date'] = strftime(builder.config.today_fmt
+ or _('%B %d, %Y'))
+ self._docinfo['copyright'] = builder.config.copyright
+ self._docinfo['version'] = builder.config.version
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cyrus-imapd.git/commitdiff/edb720e9f29ebfb7fe69d10c2952a018789a2b70
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
