From 6c257f9e4dbc8fa15d13a9aebd8eff060a0058f2 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Sep 03 2021 21:38:15 +0000 Subject: first build c9s --- diff --git a/.fmt.metadata b/.fmt.metadata index 7e017f9..59ffce7 100644 --- a/.fmt.metadata +++ b/.fmt.metadata @@ -1 +1 @@ -5936a766e3754fdfa4131bf892916c23d972b5ae SOURCES/7.1.3.tar.gz +79338d262ac521f9ff159963603fce20f15094e5 SOURCES/fmt-8.0.1.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 5c6eefc..0000000 --- a/README.md +++ /dev/null @@ -1,27 +0,0 @@ -This is a dist-git like repo for Ceph - -The master brach is unused. Use an existing branch instead. -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) - -* c8s-sig-storage-ceph-pacific: CentOS-8 -* ... - -Instructions for building the ceph package for the CentOS Storage SIG -can be found in the following places: - -* [Comunity Build System](https://wiki.centos.org/HowTos/CommunityBuildSystem) -* [Storage SIG landing page](https://wiki.centos.org/SpecialInterestGroup/Storage/Gluster) - - -E.g. build the src.rpm with: - $ rpmbuild -bs \ - --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ - --define "dist .el8s" SPECS/fmt.spec - -To build: - - $ `cbs build [--scratch] storage8s-ceph-pacific-el8s fmt-7.1.3-2.el8s.src.rpm` - - diff --git a/SPECS/fmt.spec b/SPECS/fmt.spec index 73ddc02..3b23e0d 100644 --- a/SPECS/fmt.spec +++ b/SPECS/fmt.spec @@ -1,43 +1,23 @@ %undefine __cmake_in_source_build -%bcond_with doc Name: fmt -Version: 7.1.3 -Release: 2%{?dist} -Summary: Small, safe and fast formatting library for C++ +Version: 8.0.1 +Release: 1%{?dist} License: BSD +Summary: Small, safe and fast formatting library for C++ 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 -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 +Source: https://github.com/fmtlib/%{name}/archive/%{version}/%{name}-%{version}.tar.gz + BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: ninja-build %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: cmake3 %else BuildRequires: cmake %endif -%if %{with doc} -BuildRequires: doxygen -BuildRequires: nodejs-less -%if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: python%{python3_version_nodots}-sphinx -BuildRequires: python%{python3_version_nodots}-breathe -%else -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 = %{?epoch:%{epoch}:}%{version}-%{release} @@ -58,69 +38,46 @@ Obsoletes: cppformat-devel < %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the header file for using %{name}. -%if %{with doc} -%package doc -Summary: Documentation files for %{name} -License: Python -BuildArch: noarch - -# This package replaces the old name of cppformat -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}. -%endif - %prep %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 -%cmake .. \ +%if 0%{?rhel} && 0%{?rhel} <= 7 +%cmake3 \ +%else +%cmake \ +%endif + -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DFMT_CMAKE_DIR=%{_datadir}/cmake/%{name} \ + -DFMT_CMAKE_DIR=%{_libdir}/cmake/%{name} \ -DFMT_LIB_DIR=%{_libdir} - -%cmake_build --target all - -%if %{with doc} -# Remove temporary build products -rm -rf %{_vpath_builddir}/doc/html/{.buildinfo,.doctrees,objects.inv} -%endif +%cmake_build %install -pwd -pushd build %cmake_install %check +%ctest %files %license LICENSE.rst %doc ChangeLog.rst README.rst -%{_libdir}/lib%{name}.so.7* +%{_libdir}/lib%{name}.so.8* %files devel %{_includedir}/%{name} %{_libdir}/lib%{name}.so -%{_datadir}/cmake/%{name} +%{_libdir}/cmake/%{name} %{_libdir}/pkgconfig/%{name}.pc -%if %{with doc} -%files doc -%doc %{_datadir}/doc/%{name} -%license doc/python-license.txt -%endif - %changelog +* Fri Sep 3 2021 Kaleb S. KEITHLEY - 8.0.1-1 +- build for c9s + +* Mon May 03 2021 Vitaly Zaitsev - 7.1.3-3 +- Fixed RHBZ#1956521. + * Tue Jan 26 2021 Fedora Release Engineering - 7.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild