From 5af28e8eb6c8455b226ba58d41926dcbea3ab044 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 9 Mar 2020 16:43:35 +0100 Subject: [PATCH] Fix libdir in pkgconfig --- gflags-fix_pkgconfig.patch | 12 ++++++++++++ gflags.spec | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 gflags-fix_pkgconfig.patch diff --git a/gflags-fix_pkgconfig.patch b/gflags-fix_pkgconfig.patch new file mode 100644 index 0000000..c0d33ec --- /dev/null +++ b/gflags-fix_pkgconfig.patch @@ -0,0 +1,12 @@ +diff -up gflags-2.2.2/cmake/package.pc.in.orig gflags-2.2.2/cmake/package.pc.in +--- gflags-2.2.2/cmake/package.pc.in.orig 2018-11-11 22:21:00.000000000 +0100 ++++ gflags-2.2.2/cmake/package.pc.in 2020-03-09 13:54:40.797884193 +0100 +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + bindir=${prefix}/@RUNTIME_INSTALL_DIR@ +-libdir=${prefix}/@LIBRARY_INSTALL_DIR@ ++libdir=@LIBRARY_INSTALL_DIR@ + includedir=${prefix}/@INCLUDE_INSTALL_DIR@ + + Name: @PACKAGE_NAME@ diff --git a/gflags.spec b/gflags.spec index 74e85c3..6d72f24 100644 --- a/gflags.spec +++ b/gflags.spec @@ -1,11 +1,12 @@ Name: gflags Version: 2.2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for commandline flag processing License: BSD URL: https://gflags.github.io/gflags/ Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: gflags-fix_pkgconfig.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -25,7 +26,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package contains development files for %{name}. %prep -%setup -q +%autosetup -p1 %build %cmake -DBUILD_TESTING:BOOL=ON \ @@ -58,6 +59,9 @@ ctest %{_libdir}/cmake/%{name} %changelog +* Mon Mar 09 2020 Nicolas Chauvet - 2.2.2-5 +- Fix pkgconfig libdir value + * Tue Jan 28 2020 Fedora Release Engineering - 2.2.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild