From bc262c1c0528d03905149538d41af2124245c635 Mon Sep 17 00:00:00 2001 From: yuanxing Date: Wed, 12 May 2021 20:11:26 +0800 Subject: [PATCH] add patch:add the library file search path in pc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加补丁:在pc文件中添加库文件搜索路径 --- ...d-the-library-file-search-path-in-pc.patch | 29 +++++++++++++++++++ lunar-date.spec | 7 +++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 0002-fix-PC-add-the-library-file-search-path-in-pc.patch diff --git a/0002-fix-PC-add-the-library-file-search-path-in-pc.patch b/0002-fix-PC-add-the-library-file-search-path-in-pc.patch new file mode 100644 index 0000000..6b05bc2 --- /dev/null +++ b/0002-fix-PC-add-the-library-file-search-path-in-pc.patch @@ -0,0 +1,29 @@ +From 0839f105374d3cbf89de0557a81e2d6feeedfcf5 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Wed, 12 May 2021 19:59:13 +0800 +Subject: [PATCH 2/2] fix(PC):add the library file search path in pc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +- 在PC文件中添加库文件搜索路径 +--- + lunar-date/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lunar-date/meson.build b/lunar-date/meson.build +index 38fb7a0..da7d625 100644 +--- a/lunar-date/meson.build ++++ b/lunar-date/meson.build +@@ -53,7 +53,7 @@ pkg.generate( + description: 'Chinese Lunar Date Library', + requires_private: 'gio-2.0', + filebase: 'lunar-date-3.0', +- libraries: '-llunar-date-3.0', ++ libraries: '-L${libdir} -llunar-date-3.0', + subdirs: 'lunar-date-3.0', + ) + +-- +2.18.1 + diff --git a/lunar-date.spec b/lunar-date.spec index 244fce0..3aef28c 100644 --- a/lunar-date.spec +++ b/lunar-date.spec @@ -21,11 +21,14 @@ Version: 2.9.3 %define _libver 3_0 -Release: 1.9%{?dist} +Release: 1.9%{?dist}.kb1 License: GPL-2.0+ Group: System/I18n/Chinese Url: http://liblunar.googlecode.com/ Source: https://liblunar.googlecode.com/files/%{name}-%{version}.tar.gz + +Patch0001: 0002-fix-PC-add-the-library-file-search-path-in-pc.patch + BuildRequires: gobject-introspection-devel intltool BuildRequires: meson @@ -64,7 +67,7 @@ Development files for Chinese Lunar calendar library Holiday definition file for Chinese Lunar calendar library %prep -%autosetup -S git +%autosetup -p1 %build %meson -Denable_gtk_doc=true -Dwith_introspection=true -Dwith_vala=false -Denable_tests=true