From 21d2e6aec794a2494dd1b0fc6da42150b81eb6e2 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Fri, 20 Dec 2024 09:17:40 +0800 Subject: [PATCH] Fix pkgconfig libdir value (cherry picked from commit e616e476c79046a32aaaf872edde2508b25c3a0d) --- gflags-fix_pkgconfig.patch | 12 ++++++++++++ gflags.spec | 33 ++++++++++++++++----------------- 2 files changed, 28 insertions(+), 17 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 aa8a349..435df33 100644 --- a/gflags.spec +++ b/gflags.spec @@ -1,20 +1,20 @@ -%global _description \ -The gflags package contains a library that implements commandline \ -flags processing. As such it's a replacement for getopt(). It has \ -increased flexibility, including built-in support for C++ types like \ -string, and the ability to define flags in the source file in which \ -they are used. - Name: gflags Version: 2.2.2 -Release: 3 +Release: 4 Summary: A C++ library for commandline flag processing -License: BSD +License: BSD-3-Clause URL: https://gflags.github.io/gflags/ Source0: https://github.com/gflags/gflags/archive/v%{version}/gflags-%{version}.tar.gz -BuildRequires: gcc-c++ cmake +Patch0: gflags-fix_pkgconfig.patch +BuildRequires: gcc-c++ +BuildRequires: cmake >= 3.0.2 -%description %_description +%description +The gflags package contains a library that implements commandline +flags processing. As such it's a replacement for getopt(). It has +increased flexibility, including built-in support for C++ types like +string, and the ability to define flags in the source file in which +they are used. %package devel Summary: Development files for gflags @@ -39,13 +39,9 @@ This package contains development files for gflags. %check ctest -%post -/sbin/ldconfig -%postun -/sbin/ldconfig - %files -%doc AUTHORS.txt ChangeLog.txt README.md COPYING.txt +%license COPYING.txt +%doc AUTHORS.txt ChangeLog.txt README.md %{_bindir}/gflags_completions.sh %{_libdir}/libgflags.so.* %{_libdir}/libgflags_nothreads.so.* @@ -58,6 +54,9 @@ ctest %{_libdir}/cmake/gflags %changelog +* Wed Oct 16 2024 Funda Wang - 2.2.2-4 +- Fix pkgconfig libdir value + * Sat Oct 29 2022 chengzeruizhi - 2.2.2-3 - Type:requirement - ID:NA -- Gitee