From 591078f81f3da317134eb2cb28e9a3749622e04c Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 13 Oct 2018 11:06:43 +0800 Subject: [PATCH] update to 5.2.1 - split fmt_build_doc_system.patch into smaller patches, to simplify the patch management - drop fmt_test8_segfault.patch, as it does not apply anymore - add patches to avoid accessing to internet via installed document - use python3 packages to adapt fedora python3 migration - drop fmt-static package, as it's non-trivial to build static and shared libraries in a single run. and it's not encouraged to ship static library, see https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries_2 - package ChangeLog.rst README.rst in fmt package, to help use to understand the latest changes, and to silence rpmlint warnings - pass cmake options in multiple lines, to have less code churn of future changes. - drop DCMAKE_SKIP_RPATH=OFF, as RHEL6 is not supported anymore - use %make_build and %make_install macros, see https://fedoraproject.org/wiki/Packaging:Cmake - bump up packaged fmt to v5.2.1 Signed-off-by: Kefu Chai --- ...tes-layout-stripped-Google-Analytics.patch | 29 ++++++++ ...lates-layout-stripped-download-links.patch | 58 +++++++++++++++ ...ld-do-not-create-virtual-environment.patch | 37 ++++++++++ ...build-removed-all-pip-internet-stuff.patch | 72 +++++++++++++++++++ doc-build-use-python3.patch | 32 +++++++++ doc-build-use-sphinx-build-3.patch | 45 ++++++++++++ doc-index-removed-GitHub-iframe.patch | 24 +++++++ fmt.spec | 71 +++++++++--------- fmt_build_doc_system.patch | 56 --------------- fmt_test8_segfault.patch | 38 ---------- sources | 2 +- 11 files changed, 334 insertions(+), 130 deletions(-) create mode 100644 doc-_templates-layout-stripped-Google-Analytics.patch create mode 100644 doc-_templates-layout-stripped-download-links.patch create mode 100644 doc-build-do-not-create-virtual-environment.patch create mode 100644 doc-build-removed-all-pip-internet-stuff.patch create mode 100644 doc-build-use-python3.patch create mode 100644 doc-build-use-sphinx-build-3.patch create mode 100644 doc-index-removed-GitHub-iframe.patch delete mode 100644 fmt_build_doc_system.patch delete mode 100644 fmt_test8_segfault.patch diff --git a/doc-_templates-layout-stripped-Google-Analytics.patch b/doc-_templates-layout-stripped-Google-Analytics.patch new file mode 100644 index 0000000..69f11f2 --- /dev/null +++ b/doc-_templates-layout-stripped-Google-Analytics.patch @@ -0,0 +1,29 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 7 Nov 2015 19:49:54 +0100 +Subject: doc: _templates: layout: stripped Google Analytics + +--- + doc/_templates/layout.html | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html +index 0ac2dec..8f5dfd9 100644 +--- a/doc/_templates/layout.html ++++ b/doc/_templates/layout.html +@@ -5,16 +5,6 @@ + + + +-{# Google Analytics #} +- + {% endblock %} + + {%- macro searchform(classes, button) %} diff --git a/doc-_templates-layout-stripped-download-links.patch b/doc-_templates-layout-stripped-download-links.patch new file mode 100644 index 0000000..a5a6ce5 --- /dev/null +++ b/doc-_templates-layout-stripped-download-links.patch @@ -0,0 +1,58 @@ +From: "Eugene V. Lyubimkin" +Date: Sat, 7 Nov 2015 19:53:09 +0100 +Subject: doc: _templates: layout: stripped download links + +--- + doc/_templates/layout.html | 29 +---------------------------- + 1 file changed, 1 insertion(+), 28 deletions(-) + +diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html +index 8f5dfd9..7bc00fc 100644 +--- a/doc/_templates/layout.html ++++ b/doc/_templates/layout.html +@@ -38,20 +38,9 @@ + + {fmt} + +- + {# Collect the nav links, forms, and other content for toggling #} +