Accepting request 752319 from home:alois:branches:devel:libraries:c_c++

update to 6.0.0

OBS-URL: https://build.opensuse.org/request/show/752319
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/fmt?expand=0&rev=9
This commit is contained in:
Luigi Baldoni 2019-11-29 10:25:23 +00:00 committed by Git OBS Bridge
parent d8e42642c2
commit 2a9e845bee
6 changed files with 18 additions and 39 deletions

View File

@ -1,30 +0,0 @@
From: Olaf Hering <olaf@aepfle.de>
Date: Mon, 25 Mar 2019 17:10:40 +0100
Subject: install pkg-config file into libdir
Most pkgconfig files contain a Libs: variable, which is either /usr/lib
or /usr/lib64. If a 32bit and a 64bit variant of fmt libraries is
installed, the last one wins. As a result compiling for the other
bitsize will fail.
Instead of sharedir use libdir as install target.
Fixes commit 9d0c9c4bb145a286f725cd38c90331eee7addc7f
Fixes commit 287342dab10a5a96479b3e21cd11ce671ed8125c
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ if (FMT_INSTALL)
set(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/fmt CACHE STRING
"Installation directory for include files, relative to ${CMAKE_INSTALL_PREFIX}.")
- set(FMT_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH
+ set(FMT_PKGCONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/pkgconfig CACHE PATH
"Installation directory for pkgconfig (.pc) files, relative to ${CMAKE_INSTALL_PREFIX}.")
# Generate the version, config and target files into the build directory.

View File

@ -1 +1 @@
libfmt5 libfmt6

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
size 662493

3
fmt-6.0.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1907a58d5e86e6c382e51441d92ad9e23aea63827ba47fd647eacc0d3a16c78
size 708425

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Nov 29 08:46:30 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
- Update to version 6.0.0
(too many changes to list, see ChangeLog.rst)
- Dropped 0001-install-pkg-config-file-into-libdir.patch (no
longer necessary)
- Switched to MIT license
- Increased SOVERSION to 6
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 25 16:21:01 UTC 2019 - olaf@aepfle.de Mon Mar 25 16:21:01 UTC 2019 - olaf@aepfle.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package fmt # spec file for package fmt
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,17 +16,16 @@
# #
%define sover 5 %define sover 6
Name: fmt Name: fmt
Version: 5.3.0 Version: 6.0.0
Release: 0 Release: 0
Summary: A formatting library for C++ Summary: A formatting library for C++
License: BSD-2-Clause License: MIT
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
URL: http://fmtlib.net/ URL: http://fmtlib.net/
Source0: https://github.com/fmtlib/fmt/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: https://github.com/fmtlib/fmt/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf Source1: baselibs.conf
Patch0: 0001-install-pkg-config-file-into-libdir.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig