!6 Add Requires lunar-date for lunar-date-devel

From: @tangjie02
Reviewed-by: @doudou19
Signed-off-by: @doudou19
This commit is contained in:
openeuler-ci-bot 2021-10-25 10:35:32 +00:00 committed by Gitee
commit 8bc6c65c43
2 changed files with 9 additions and 34 deletions

View File

@ -1,29 +0,0 @@
From 0839f105374d3cbf89de0557a81e2d6feeedfcf5 Mon Sep 17 00:00:00 2001
From: rpm-build <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

View File

@ -21,14 +21,11 @@ Version: 2.9.3
%define _libver 3_0
Release: 1.9%{?dist}.kb1
Release: 1.9.kb2
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
@ -48,6 +45,7 @@ Group: System/I18n/Chinese
Summary: Chinese Lunar calendar library development files
Group: Development/Libraries/C and C++
Requires: typelib-1_0-LunarDate-%{_libver} = %{version}
Requires: lunar-date%{?_isa} = %{version}-%{release}
%package holiday
Summary: Chinese Holiday definition
@ -67,7 +65,7 @@ Development files for Chinese Lunar calendar library
Holiday definition file for Chinese Lunar calendar library
%prep
%autosetup -p1
%autosetup -S git
%build
%meson -Denable_gtk_doc=true -Dwith_introspection=true -Dwith_vala=false -Denable_tests=true
@ -108,5 +106,11 @@ Holiday definition file for Chinese Lunar calendar library
%{_datadir}/gtk-doc/html/%{name}
%changelog
* Fri May 14 2021 longcheng <longcheng@kylinos.com.cn> - 2.9.3-1.9.kb2
- KYOS-B: Add Requires lunar-date for lunar-date-devel (#38372)
* Mon May 10 2021 kpkg <kpkg@kylinos.com.cn> - 2.9.3-1.9.kb1
- rebuild for KY3.4-4
* Thu Jul 02 2020 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 2.9.3
- KYOS-F: liblunar-date, version 2.9.3 Related #27425