From acda7a286696c1698b3bb39065993929c1a19200 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Mar 29 2021 13:54:37 +0000 Subject: fmt 7.1.3 for c8 stream --- diff --git a/README.md b/README.md index 2aeceef..5c6eefc 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-pacific: CentOS-8 +* c8s-sig-storage-ceph-pacific: CentOS-8 * ... Instructions for building the ceph package for the CentOS Storage SIG @@ -18,10 +18,10 @@ can be found in the following places: E.g. build the src.rpm with: $ rpmbuild -bs \ --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ - --define "dist .el8" SPECS/fmt.spec + --define "dist .el8s" SPECS/fmt.spec To build: - $ `cbs build [--scratch] storage8-ceph-pacific-el8 fmt-7.1.3-2.el8.src.rpm` + $ `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 6dfd24f..73ddc02 100644 --- a/SPECS/fmt.spec +++ b/SPECS/fmt.spec @@ -89,7 +89,7 @@ pushd build -DFMT_CMAKE_DIR=%{_datadir}/cmake/%{name} \ -DFMT_LIB_DIR=%{_libdir} -make all +%cmake_build --target all %if %{with doc} # Remove temporary build products @@ -97,7 +97,9 @@ rm -rf %{_vpath_builddir}/doc/html/{.buildinfo,.doctrees,objects.inv} %endif %install -%make_install -C build +pwd +pushd build +%cmake_install %check