Hello community, here is the log from the commit of package fmt for openSUSE:Factory checked in at 2019-03-26 15:45:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fmt (Old) and /work/SRC/openSUSE:Factory/.fmt.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fmt" Tue Mar 26 15:45:38 2019 rev:3 rq:688601 version:5.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/fmt/fmt.changes 2019-01-15 09:17:45.498158217 +0100 +++ /work/SRC/openSUSE:Factory/.fmt.new.25356/fmt.changes 2019-03-26 15:45:43.524073226 +0100 @@ -1,0 +2,6 @@ +Mon Mar 25 16:21:01 UTC 2019 - o...@aepfle.de + +- Install fmt.pc into libdir with + 0001-install-pkg-config-file-into-libdir.patch + +------------------------------------------------------------------- New: ---- 0001-install-pkg-config-file-into-libdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fmt.spec ++++++ --- /var/tmp/diff_new_pack.Z8bmeB/_old 2019-03-26 15:45:44.468072772 +0100 +++ /var/tmp/diff_new_pack.Z8bmeB/_new 2019-03-26 15:45:44.472072770 +0100 @@ -26,6 +26,7 @@ URL: http://fmtlib.net/ Source0: https://github.com/fmtlib/fmt/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf +Patch0: 0001-install-pkg-config-file-into-libdir.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -50,7 +51,7 @@ Development files for fmt, a formatting library for C++. %prep -%setup -q +%autosetup -p1 %build %cmake -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} @@ -81,6 +82,6 @@ %{_includedir}/%{name} %{_libdir}/cmake/%{name} %{_libdir}/libfmt.so -%{_datadir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{name}.pc %changelog ++++++ 0001-install-pkg-config-file-into-libdir.patch ++++++ From: Olaf Hering <o...@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 <o...@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.
