Updated to version 6.1.2.

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,2 +1,7 @@
 /fmt-3.0.0.zip
 /fmt-3.0.1.zip
+/fmt-3.0.1.tar.gz
+/fmt-3.0.2.tar.gz
+/5.2.1.tar.gz
+/5.3.0.tar.gz
+/6.1.2.tar.gz

doc-_templates-layout-stripped-Google-Analytics.patch

@@ -0,0 +1,24 @@
+diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
+index d5f4b70d..8ff160de 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -5,16 +5,6 @@
+ <meta name="keywords" content="C++, formatting, printf, string, library">
+ <meta name="author" content="Victor Zverovich">
+ <link rel="stylesheet" href="_static/fmt.css">
+-{# Google Analytics #}
+-<script>
+-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();
+-    a=s.createElement(o),m=s.getElementsByTagName(o)[0];a.async=1;
+-    a.src=g;m.parentNode.insertBefore(a,m)
+-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+-  ga('create', 'UA-20116650-4', 'fmtlib.net');
+-  ga('send', 'pageview');
+-</script>
+ {% endblock %}
+ 
+ {%- macro searchform(classes, button) %}
+-- 
+2.24.1
+

doc-_templates-layout-stripped-download-links.patch

@@ -0,0 +1,49 @@
+diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
+index 8ff160de..85eba08d 100644
+--- a/doc/_templates/layout.html
++++ b/doc/_templates/layout.html
+@@ -42,16 +42,6 @@
+         {# Collect the nav links, forms, and other content for toggling #}
+         <div class="collapse navbar-collapse">
+           <ul class="nav navbar-nav">
+-            <li class="dropdown">
+-              <a href="#" class="dropdown-toggle" data-toggle="dropdown"
+-                 role="button" aria-expanded="false">{{ version }}
+-                <span class="caret"></span></a>
+-              <ul class="dropdown-menu" role="menu">
+-                {% for v in versions.split(',') %}
+-                <li><a href="https://fmt.dev/{{v}}">{{v}}</a></li>
+-                {% endfor %}
+-              </ul>
+-            </li>
+             {% for name in ['Contents', 'Usage', 'API', 'Syntax'] %}
+               {% if pagename == name.lower() %}
+               <li class="active"><a href="{{name.lower()}}.html">{{name}}
+@@ -74,23 +64,7 @@
+ <div class="jumbotron">
+   <div class="tb-container">
+     <h1>{fmt}</h1>
+-    <p class="lead">A modern formatting library</p>
+-    <div class="btn-group" role="group">
+-      {% set name = 'fmt' if version.split('.')[0]|int >= 3 else 'cppformat' %}
+-      <a class="btn btn-success"
+-         href="{{download_url}}/{{version}}/{{name}}-{{version}}.zip">
+-           <span class="glyphicon glyphicon-download"></span> Download
+-      </a>
+-      <button type="button" class="btn btn-success dropdown-toggle"
+-        data-toggle="dropdown"><span class="caret"></span></button>
+-      <ul class="dropdown-menu">
+-      {% for v in versions.split(',') %}
+-      {% set name = 'fmt' if v.split('.')[0]|int >= 3 else 'cppformat' %}
+-        <li><a href="{{download_url}}/{{v}}/{{name}}-{{v}}.zip">Version {{v}}
+-          </a></li>
+-      {% endfor %}
+-      </ul>
+-    </div>
++    <p class="lead">Small, safe and fast formatting library for C++</p>
+   </div>
+ </div>
+ {% endif %}
+-- 
+2.24.1
+

doc-build-do-not-create-virtual-environment.patch

@@ -0,0 +1,30 @@
+diff --git a/doc/build.py b/doc/build.py
+index f46d483e..517d9f39 100755
+--- a/doc/build.py
++++ b/doc/build.py
+@@ -7,16 +7,6 @@ from subprocess import check_call, check_output, CalledProcessError, Popen, PIPE
+ 
+ versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1', '5.3.0', '6.0.0', '6.1.0', '6.1.1', '6.1.2']
+ 
+-def create_build_env(dirname='virtualenv'):
+-  # Create virtualenv.
+-  if not os.path.exists(dirname):
+-    check_call(['virtualenv', dirname])
+-  import sysconfig
+-  scripts_dir = os.path.basename(sysconfig.get_path('scripts'))
+-  activate_this_file = os.path.join(dirname, scripts_dir, 'activate_this.py')
+-  with open(activate_this_file) as f:
+-    exec(f.read(), dict(__file__=activate_this_file))
+-
+ def build_docs(version='dev', **kwargs):
+   doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__)))
+   work_dir = kwargs.get('work_dir', '.')
+@@ -78,5 +68,4 @@ def build_docs(version='dev', **kwargs):
+   return html_dir
+ 
+ if __name__ == '__main__':
+-  create_build_env()
+   build_docs(sys.argv[1])
+-- 
+2.24.1
+

doc-build-removed-all-pip-internet-stuff.patch

@@ -0,0 +1,66 @@
+diff --git a/doc/build.py b/doc/build.py
+index 31049716..f46d483e 100755
+--- a/doc/build.py
++++ b/doc/build.py
+@@ -4,27 +4,9 @@
+ from __future__ import print_function
+ import errno, os, shutil, sys, tempfile
+ from subprocess import check_call, check_output, CalledProcessError, Popen, PIPE
+-from distutils.version import LooseVersion
+ 
+ versions = ['1.0.0', '1.1.0', '2.0.0', '3.0.2', '4.0.0', '4.1.0', '5.0.0', '5.1.0', '5.2.0', '5.2.1', '5.3.0', '6.0.0', '6.1.0', '6.1.1', '6.1.2']
+ 
+-def pip_install(package, commit=None, **kwargs):
+-  "Install package using pip."
+-  min_version = kwargs.get('min_version')
+-  if min_version:
+-    from pkg_resources import get_distribution, DistributionNotFound
+-    try:
+-      installed_version = get_distribution(os.path.basename(package)).version
+-      if LooseVersion(installed_version) >= min_version:
+-        print('{} {} already installed'.format(package, min_version))
+-        return
+-    except DistributionNotFound:
+-      pass
+-  if commit:
+-    package = 'git+https://github.com/{0}.git@{1}'.format(package, commit)
+-  print('Installing {0}'.format(package))
+-  check_call(['pip', 'install', package])
+-
+ def create_build_env(dirname='virtualenv'):
+   # Create virtualenv.
+   if not os.path.exists(dirname):
+@@ -34,30 +16,6 @@ def create_build_env(dirname='virtualenv'):
+   activate_this_file = os.path.join(dirname, scripts_dir, 'activate_this.py')
+   with open(activate_this_file) as f:
+     exec(f.read(), dict(__file__=activate_this_file))
+-  # Import get_distribution after activating virtualenv to get info about
+-  # the correct packages.
+-  from pkg_resources import get_distribution, DistributionNotFound
+-  # Upgrade pip because installation of sphinx with pip 1.1 available on Travis
+-  # is broken (see #207) and it doesn't support the show command.
+-  pip_version = get_distribution('pip').version
+-  if LooseVersion(pip_version) < LooseVersion('1.5.4'):
+-    print("Updating pip")
+-    check_call(['pip', 'install', '--upgrade', 'pip'])
+-  # Upgrade distribute because installation of sphinx with distribute 0.6.24
+-  # available on Travis is broken (see #207).
+-  try:
+-    distribute_version = get_distribution('distribute').version
+-    if LooseVersion(distribute_version) <= LooseVersion('0.6.24'):
+-      print("Updating distribute")
+-      check_call(['pip', 'install', '--upgrade', 'distribute'])
+-  except DistributionNotFound:
+-    pass
+-  # Install Sphinx and Breathe.
+-  pip_install('sphinx-doc/sphinx', '12b83372ac9316e8cbe86e7fed889296a4cc29ee',
+-              min_version='1.4.1.dev20160531')
+-  pip_install('michaeljones/breathe',
+-              '129222318f7c8f865d2631e7da7b033567e7f56a',
+-              min_version='4.2.0')
+ 
+ def build_docs(version='dev', **kwargs):
+   doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__)))
+-- 
+2.24.1
+

doc-build-use-python3.patch

@@ -0,0 +1,22 @@
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 2af32d53..0ad2d602 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -4,11 +4,13 @@ if (NOT DOXYGEN)
+   return ()
+ endif ()
+ 
++find_package(PythonInterp
++  QUIET REQUIRED)
+ find_program(SPHINX_EXECUTABLE
+   NAMES sphinx-build sphinx-build-3)
+ add_custom_target(doc
+   COMMAND ${CMAKE_COMMAND} -E env SPHINX_EXECUTABLE=${SPHINX_EXECUTABLE}
+-    ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
++    ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
+   SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html)
+ 
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
+-- 
+2.24.1
+

doc-build-use-sphinx-build-3.patch

@@ -0,0 +1,34 @@
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index f3dae606..2af32d53 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -4,8 +4,11 @@ if (NOT DOXYGEN)
+   return ()
+ endif ()
+ 
++find_program(SPHINX_EXECUTABLE
++  NAMES sphinx-build sphinx-build-3)
+ add_custom_target(doc
+-  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
++  COMMAND ${CMAKE_COMMAND} -E env SPHINX_EXECUTABLE=${SPHINX_EXECUTABLE}
++    ${CMAKE_CURRENT_SOURCE_DIR}/build.py ${FMT_VERSION}
+   SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html)
+ 
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/
+diff --git a/doc/build.py b/doc/build.py
+index 517d9f39..2c80ed5a 100755
+--- a/doc/build.py
++++ b/doc/build.py
+@@ -49,7 +49,8 @@ def build_docs(version='dev', **kwargs):
+     raise CalledProcessError(p.returncode, cmd)
+   html_dir = os.path.join(work_dir, 'html')
+   main_versions = reversed(versions[-3:])
+-  check_call(['sphinx-build',
++  sphinx_build = os.environ.get('SPHINX_EXECUTABLE', 'sphinx-build')
++  check_call([sphinx_build,
+               '-Dbreathe_projects.format=' + os.path.abspath(doxyxml_dir),
+               '-Dversion=' + version, '-Drelease=' + version,
+               '-Aversion=' + version, '-Aversions=' + ','.join(main_versions),
+-- 
+2.24.1
+

doc-index-removed-GitHub-iframe.patch

@@ -0,0 +1,20 @@
+diff --git a/doc/index.rst b/doc/index.rst
+index cbc9154d..b1782c3d 100644
+--- a/doc/index.rst
++++ b/doc/index.rst
+@@ -191,12 +191,3 @@ Ease of Use
+ just three header files and no external dependencies.
+ A permissive MIT `license <https://github.com/fmtlib/fmt#license>`_ allows
+ using the library both in open-source and commercial projects.
+-
+-.. raw:: html
+-
+-  <a class="btn btn-success" href="https://github.com/fmtlib/fmt">GitHub Repository</a>
+-
+-  <div class="section footer">
+-    <iframe src="http://ghbtns.com/github-btn.html?user=fmtlib&amp;repo=fmt&amp;type=watch&amp;count=true"
+-            class="github-btn" width="100" height="20"></iframe>
+-  </div>
+-- 
+2.24.1
+

fmt.spec

@@ -1,26 +1,46 @@
 Name:           fmt
-Version:        3.0.1
+Version:        6.1.2
 Release:        1%{?dist}
 Summary:        Small, safe and fast formatting library for C++
 
 License:        BSD
 URL:            https://github.com/fmtlib/fmt
-Source0:        https://github.com/fmtlib/fmt/releases/download/%{version}/%{name}-%{version}.zip
+Source0:        https://github.com/fmtlib/fmt/archive/%{version}.tar.gz
+# See https://github.com/fmtlib/fmt/issues/443 and https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/LVKYLDLJVWAVJE4MQVKDO6PYZRD5MCP6/
+Patch1:         doc-build-removed-all-pip-internet-stuff.patch
+Patch3:         doc-build-do-not-create-virtual-environment.patch
+Patch4:         doc-_templates-layout-stripped-Google-Analytics.patch
+Patch5:         doc-_templates-layout-stripped-download-links.patch
+Patch6:         doc-index-removed-GitHub-iframe.patch
+Patch7:         doc-build-use-sphinx-build-3.patch
+Patch8:         doc-build-use-python3.patch
 
-%if 0%{?rhel}
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+%if 0%{?rhel} && 0%{?rhel} <= 7
 BuildRequires:  cmake3
 %else
 BuildRequires:  cmake
 %endif
-
-%description
-C++ Format is an open-source formatting library for C++. It can be used as a
-safe alternative to printf or as a fast alternative to IOStreams.
+# For building documentation
+BuildRequires:  doxygen
+BuildRequires:  nodejs-less
+%if 0%{?fedora}
+BuildRequires:  python3-sphinx
+BuildRequires:  python3-breathe
+%else
+BuildRequires:  python2-sphinx
+BuildRequires:  python2-breathe
+%endif
 
 # This package replaces the old name of cppformat
 Provides:       cppformat = %{version}-%{release}
 Obsoletes:      cppformat < %{version}-%{release}
 
+%description
+C++ Format is an open-source formatting library for C++. It can be used as a
+safe alternative to printf or as a fast alternative to IOStreams.
+
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -32,13 +52,6 @@ Obsoletes:      cppformat-devel < %{version}-%{release}
 %description    devel
 This package contains the header file for using %{name}.
 
-%package        static
-Summary:        Header only development files for %{name}
-Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
-
-%description    static
-This package contains the files for using %{name} as a header only library.
-
 %package        doc
 Summary:        Documentation files for %{name}
 License:        Python
@@ -53,56 +66,100 @@ This package contains documentation for developer documentation for %{name}.
 
 %prep
 %autosetup -p1
+mkdir build
 
 %build
-mkdir build
-cd build
-cmakeopts="-DFMT_LIB_DIR=%{_lib} -DFMT_CMAKE_DIR=%{_datarootdir}/cmake/%{name}"
-# NOTE: Specifying CMAKE_SKIP_RPATH=OFF is so it will link properly on RHEL 6
-# See https://bugzilla.redhat.com/show_bug.cgi?id=640672
-%if 0%{?rhel}%{?fedora} == 6
-cmakeopts="$cmakeopts -DCMAKE_SKIP_RPATH=OFF"
-%endif
-%if 0%{?rhel}
-%cmake3 \
+pushd build
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%cmake3 ..                                    \
 %else
-%cmake \
+%cmake ..                                     \
 %endif
- $cmakeopts ..
-make %{?_smp_mflags} all
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo         \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON      \
+    -DFMT_CMAKE_DIR=%{_datadir}/cmake/%{name} \
+    -DFMT_LIB_DIR=%{_libdir}
+
+# Remove --clean-css since that plugin isn't available
+sed -i "s/'--clean-css',//" ../doc/build.py
+%make_build all doc
+# Remove temporary build products
+rm -rf ../build/doc/html/{.buildinfo,.doctrees,objects.inv}
 
 %install
-make -C build install DESTDIR=%{buildroot}
+%make_install -C build
 
 %check
-make -C build test
+pushd build
+ctest -VV %{?_smp_mflags}
+popd
 
 %files
-%{_libdir}/libfmt.so.*
-%{!?_licensedir:%global license %%doc}
 %license LICENSE.rst
+%doc ChangeLog.rst README.rst
+%{_libdir}/lib%{name}.so.6*
 
 %files devel
-%{_includedir}/fmt/
-%{_libdir}/libfmt.so
-%{_datarootdir}/cmake/fmt/
-
-%files static
-%{_includedir}/fmt/format.cc
-%{_includedir}/fmt/ostream.cc
-%{_includedir}/fmt/ostream.h
-%{_includedir}/fmt/posix.h
-%{_includedir}/fmt/time.h
+%{_includedir}/%{name}
+%{_libdir}/lib%{name}.so
+%{_datadir}/cmake/%{name}
+%{_libdir}/pkgconfig/%{name}.pc
 
 %files doc
-%doc doc/html/
+%doc %{_datadir}/doc/%{name}
 %license doc/python-license.txt
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
 %changelog
+* Wed Dec 18 2019 Vitaly Zaitsev <vitaly@easycoding.org> - 6.1.2-1
+- Updated to version 6.1.2.
+- Recreated all documentation patches.
+- SPEC file cleanup.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 10 2019 Jan Staněk <jstanek@redhat.com> - 5.3.0-1
+- Update to 5.3.0
+- Recreate documentation build patches
+- Package new pkg-config files
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Oct 11 2018 Kefu Chai <tchaikov@gmail.com> - 5.2.1-1
+- Update to 5.2.1
+- Build using python3 packages on fedora
+- Remove links in document accessing network
+- Package ChangeLog.rst and README.rst
+- Drop fmt-static package
+
+* Fri Aug 31 2018 Leigh Scott <leigh123linux@googlemail.com> - 3.0.2-7
+- Fix python2 issue for doc
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 09 2017 Dave Johansen <davejohansen@gmail.com> - 3.0.2-4
+- Patch for Test 8 segfault
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Jun 24 2017 Dave Johansen <davejohansen@gmail.com> - 3.0.2-1
+- Upstream release
+
+* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
+
+* Tue Dec 27 2016 Dave Johansen <davejohansen@gmail.com> - 3.0.1-2
+- Build documentation
+
 * Fri Nov 25 2016 Dave Johansen <davejohansen@gmail.com> - 3.0.1-1
 - Upstream release
 

sources

@@ -1 +1 @@
-14505463b838befe1513b09cae112715  fmt-3.0.1.zip
+SHA512 (6.1.2.tar.gz) = 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7