From 4d9f08df22884b1a3fe5861c72ab2bc299add797 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Mar 26 2021 19:09:59 +0000 Subject: fmt-7.1.3 for ceph-pacific --- diff --git a/.fmt.metadata b/.fmt.metadata index 1af71e1..7e017f9 100644 --- a/.fmt.metadata +++ b/.fmt.metadata @@ -1 +1 @@ -39a90270631fc11e7431dff0a055f1898b0487f1 SOURCES/6.2.1.tar.gz +5936a766e3754fdfa4131bf892916c23d972b5ae SOURCES/7.1.3.tar.gz diff --git a/README.md b/README.md index 5e22e29..2aeceef 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Branch names follow convention like `c-sig-storage-ceph-VERSION>` as descibed on [Naming and Patterns for Mapping Git Branches to Koji Tags] (https://wiki.centos.org/BrianStinson/GitBranchesandKojiTags) -* c8-sig-storage-ceph-octopus: CentOS-8 +* c8-sig-storage-ceph-pacific: CentOS-8 * ... Instructions for building the ceph package for the CentOS Storage SIG @@ -22,6 +22,6 @@ E.g. build the src.rpm with: To build: - $ `cbs build [--scratch] storage8-ceph-octopus-el8 fmt-6.2.1-1.el8.src.rpm` + $ `cbs build [--scratch] storage8-ceph-pacific-el8 fmt-7.1.3-2.el8.src.rpm` diff --git a/SOURCES/doc-_templates-layout-stripped-Google-Analytics.patch b/SOURCES/doc-_templates-layout-stripped-Google-Analytics.patch new file mode 100644 index 0000000..c65f0b3 --- /dev/null +++ b/SOURCES/doc-_templates-layout-stripped-Google-Analytics.patch @@ -0,0 +1,23 @@ +diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html +index 333a606c..8ff160de 100644 +--- a/doc/_templates/layout.html ++++ b/doc/_templates/layout.html +@@ -5,15 +5,6 @@ + + + +-{# Google Analytics #} +- +- + {% endblock %} + + {%- macro searchform(classes, button) %} +-- +2.28.0 + diff --git a/SOURCES/doc-_templates-layout-stripped-download-links.patch b/SOURCES/doc-_templates-layout-stripped-download-links.patch new file mode 100644 index 0000000..cd30445 --- /dev/null +++ b/SOURCES/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 #} +
+
    +-
  • +- +- +-
    • + {% for name in ['Contents', 'Usage', 'API', 'Syntax'] %} + {% if pagename == name.lower() %} +
  • {{name}} +@@ -74,23 +64,7 @@ +
    +
    +

    {fmt}

    +-

    A modern formatting library

    +-
    +- {% set name = 'fmt' if version.split('.')[0]|int >= 3 else 'cppformat' %} +- +- Download +- +- +-
      +- {% for v in versions.split(',') %} +- {% set name = 'fmt' if v.split('.')[0]|int >= 3 else 'cppformat' %} +-
    • Version {{v}} +-
      • +- {% endfor %} +-
    +-
    ++

    Small, safe and fast formatting library for C++

    +
    +
    + {% endif %} +-- +2.28.0 + diff --git a/SOURCES/doc-build-do-not-create-virtual-environment.patch b/SOURCES/doc-build-do-not-create-virtual-environment.patch new file mode 100644 index 0000000..3888d13 --- /dev/null +++ b/SOURCES/doc-build-do-not-create-virtual-environment.patch @@ -0,0 +1,30 @@ +diff --git a/doc/build.py b/doc/build.py +index 0943505b..59a7b498 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', '6.2.0', '6.2.1', '7.0.0', '7.0.1', '7.0.2', '7.0.3', '7.1.0', '7.1.1', '7.1.2', '7.1.3'] + +-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', '.') +@@ -79,5 +69,4 @@ def build_docs(version='dev', **kwargs): + return html_dir + + if __name__ == '__main__': +- create_build_env() + build_docs(sys.argv[1]) +-- +2.28.0 + diff --git a/SOURCES/doc-build-removed-all-pip-internet-stuff.patch b/SOURCES/doc-build-removed-all-pip-internet-stuff.patch new file mode 100644 index 0000000..a97e4a8 --- /dev/null +++ b/SOURCES/doc-build-removed-all-pip-internet-stuff.patch @@ -0,0 +1,55 @@ +diff --git a/doc/build.py b/doc/build.py +index 4651756e..0943505b 100755 +--- a/doc/build.py ++++ b/doc/build.py +@@ -4,17 +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', '6.2.0', '6.2.1', '7.0.0', '7.0.1', '7.0.2', '7.0.3', '7.1.0', '7.1.1', '7.1.2', '7.1.3'] + +-def pip_install(package, commit=None, **kwargs): +- "Install package using pip." +- 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): +@@ -24,29 +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. Require the exact version of Sphinx which is +- # compatible with Breathe. +- pip_install('sphinx-doc/sphinx', '12b83372ac9316e8cbe86e7fed889296a4cc29ee') +- pip_install('michaeljones/breathe', +- '129222318f7c8f865d2631e7da7b033567e7f56a') + + def build_docs(version='dev', **kwargs): + doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__))) +-- +2.28.0 + diff --git a/SOURCES/doc-build-use-sphinx-build-3.patch b/SOURCES/doc-build-use-sphinx-build-3.patch new file mode 100644 index 0000000..607424b --- /dev/null +++ b/SOURCES/doc-build-use-sphinx-build-3.patch @@ -0,0 +1,48 @@ +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 06848450..8e5e8a83 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -5,10 +5,11 @@ if (NOT DOXYGEN) + endif () + + find_package(PythonInterp QUIET REQUIRED) ++find_program(SPHINX_EXECUTABLE NAMES sphinx-build sphinx-build-3) + + add_custom_target(doc + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build.py +- ${FMT_VERSION} ++ ${SPHINX_EXECUTABLE} ${FMT_VERSION} + SOURCES api.rst syntax.rst usage.rst build.py conf.py _templates/layout.html) + + include(GNUInstallDirs) +diff --git a/doc/build.py b/doc/build.py +index 59a7b498..8562d1bf 100755 +--- a/doc/build.py ++++ b/doc/build.py +@@ -7,7 +7,7 @@ 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', '6.2.0', '6.2.1', '7.0.0', '7.0.1', '7.0.2', '7.0.3', '7.1.0', '7.1.1', '7.1.2', '7.1.3'] + +-def build_docs(version='dev', **kwargs): ++def build_docs(sphinx_executable='sphinx-build', version='dev', **kwargs): + doc_dir = kwargs.get('doc_dir', os.path.dirname(os.path.realpath(__file__))) + work_dir = kwargs.get('work_dir', '.') + include_dir = kwargs.get( +@@ -50,7 +50,7 @@ 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', ++ check_call([sphinx_executable, + '-Dbreathe_projects.format=' + os.path.abspath(doxyxml_dir), + '-Dversion=' + version, '-Drelease=' + version, + '-Aversion=' + version, '-Aversions=' + ','.join(main_versions), +@@ -69,4 +69,4 @@ def build_docs(version='dev', **kwargs): + return html_dir + + if __name__ == '__main__': +- build_docs(sys.argv[1]) ++ build_docs(sys.argv[1], sys.argv[2]) +-- +2.28.0 + diff --git a/SOURCES/doc-index-removed-GitHub-iframe.patch b/SOURCES/doc-index-removed-GitHub-iframe.patch new file mode 100644 index 0000000..d9a7208 --- /dev/null +++ b/SOURCES/doc-index-removed-GitHub-iframe.patch @@ -0,0 +1,20 @@ +diff --git a/doc/index.rst b/doc/index.rst +index 58f29295..ae14f8e0 100644 +--- a/doc/index.rst ++++ b/doc/index.rst +@@ -189,12 +189,3 @@ Ease of Use + just three header files and no external dependencies. + A permissive MIT `license `_ allows + using the library both in open-source and commercial projects. +- +-.. raw:: html +- +- GitHub Repository +- +-
    +- +-
    +-- +2.28.0 + diff --git a/SPECS/fmt.spec b/SPECS/fmt.spec index a4f2e92..6dfd24f 100644 --- a/SPECS/fmt.spec +++ b/SPECS/fmt.spec @@ -1,7 +1,9 @@ +%undefine __cmake_in_source_build + %bcond_with doc Name: fmt -Version: 6.2.1 -Release: 1%{?dist} +Version: 7.1.3 +Release: 2%{?dist} Summary: Small, safe and fast formatting library for C++ License: BSD @@ -9,12 +11,11 @@ URL: https://github.com/fmtlib/%{name} Source0: %{url}/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 +Patch2: doc-build-do-not-create-virtual-environment.patch +Patch3: doc-_templates-layout-stripped-Google-Analytics.patch +Patch4: doc-_templates-layout-stripped-download-links.patch +Patch5: doc-index-removed-GitHub-iframe.patch +Patch6: doc-build-use-sphinx-build-3.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -33,11 +34,14 @@ BuildRequires: python%{python3_version_nodots}-breathe BuildRequires: python3-sphinx BuildRequires: python3-breathe %endif +%else +Provides: %{name}-doc = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: %{name}-doc < %{?epoch:%{epoch}:}%{version}-%{release} %endif # This package replaces the old name of cppformat -Provides: cppformat = %{version}-%{release} -Obsoletes: cppformat < %{version}-%{release} +Provides: cppformat = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: cppformat < %{?epoch:%{epoch}:}%{version}-%{release} %description C++ Format is an open-source formatting library for C++. It can be used as a @@ -45,11 +49,11 @@ safe alternative to printf or as a fast alternative to IOStreams. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} # This package replaces the old name of cppformat -Provides: cppformat-devel = %{version}-%{release} -Obsoletes: cppformat-devel < %{version}-%{release} +Provides: cppformat-devel = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: cppformat-devel < %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the header file for using %{name}. @@ -61,8 +65,8 @@ License: Python BuildArch: noarch # This package replaces the old name of cppformat -Provides: cppformat-doc = %{version}-%{release} -Obsoletes: cppformat-doc < %{version}-%{release} +Provides: cppformat-doc = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: cppformat-doc < %{?epoch:%{epoch}:}%{version}-%{release} %description doc This package contains documentation for developer documentation for %{name}. @@ -72,38 +76,35 @@ This package contains documentation for developer documentation for %{name}. %autosetup -p1 mkdir build +%if %{with doc} +# Remove --clean-css since that plugin isn't available +sed -i "s/'--clean-css',//" doc/build.py +%endif + %build pushd build -%if 0%{?rhel} && 0%{?rhel} <= 7 -%cmake3 .. \ -%else %cmake .. \ -%endif -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DFMT_CMAKE_DIR=%{_datadir}/cmake/%{name} \ -DFMT_LIB_DIR=%{_libdir} +make all + %if %{with doc} -# 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} +rm -rf %{_vpath_builddir}/doc/html/{.buildinfo,.doctrees,objects.inv} %endif %install %make_install -C build %check -pushd build -ctest -VV %{?_smp_mflags} -popd %files %license LICENSE.rst %doc ChangeLog.rst README.rst -%{_libdir}/lib%{name}.so.6* +%{_libdir}/lib%{name}.so.7* %files devel %{_includedir}/%{name} @@ -118,6 +119,27 @@ popd %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 7.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Nov 29 2020 Vitaly Zaitsev - 7.1.3-1 +- Updated to version 7.1.3. + +* Tue Nov 10 2020 Vitaly Zaitsev - 7.1.2-1 +- Updated to version 7.1.2. + +* Sat Aug 08 2020 Vitaly Zaitsev - 7.0.3-1 +- Updated to version 7.0.3. + +* Wed Jul 29 2020 Vitaly Zaitsev - 7.0.2-1 +- Updated to version 7.0.2. + +* Mon Jul 27 2020 Fedora Release Engineering - 7.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 08 2020 Vitaly Zaitsev - 7.0.1-1 +- Updated to version 7.0.1. + * Sat May 09 2020 Vitaly Zaitsev - 6.2.1-1 - Updated to version 6.2.1.