Compare commits
No commits in common. "2861f445994e11d0ed53e9206a47e34c89934851" and "d9395d87617350a296d904a226c61eefc2a597d4" have entirely different histories.
2861f44599
...
d9395d8761
29
0002-fix-PC-add-the-library-file-search-path-in-pc.patch
Normal file
29
0002-fix-PC-add-the-library-file-search-path-in-pc.patch
Normal file
@ -0,0 +1,29 @@
|
||||
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
|
||||
|
||||
Binary file not shown.
@ -21,11 +21,14 @@ Version: 2.9.3
|
||||
|
||||
%define _libver 3_0
|
||||
|
||||
Release: 5
|
||||
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
|
||||
@ -41,33 +44,36 @@ Chinese Lunar calendar library
|
||||
Summary: Chinese Lunar calendar introspection bindings
|
||||
Group: System/I18n/Chinese
|
||||
|
||||
%description -n typelib-1_0-LunarDate-%{_libver}
|
||||
Library to support date conversion from/to chinese lunar calendar
|
||||
|
||||
%package devel
|
||||
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}
|
||||
|
||||
%description devel
|
||||
Development files for Chinese Lunar calendar library
|
||||
|
||||
%package holiday
|
||||
Summary: Chinese Holiday definition
|
||||
Group: System/I18n/Chinese
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
Library to support date conversion from/to chinese lunar calendar
|
||||
|
||||
%description -n typelib-1_0-LunarDate-%{_libver}
|
||||
Introspection bindings for Chinese Lunar calendar for use in Gnome Shell
|
||||
|
||||
%description devel
|
||||
Development files for Chinese Lunar calendar library
|
||||
|
||||
%description holiday
|
||||
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 -Dc_args="$CFLAGS -DHAVE_BIND_TEXTDOMAIN_CODESET"
|
||||
%meson -Denable_gtk_doc=true -Dwith_introspection=true -Dwith_vala=false -Denable_tests=true
|
||||
%meson_build
|
||||
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
%find_lang %{name}
|
||||
@ -102,23 +108,5 @@ Holiday definition file for Chinese Lunar calendar library
|
||||
%{_datadir}/gtk-doc/html/%{name}
|
||||
|
||||
%changelog
|
||||
* Wed Apr 12 2023 wangyucheng <wangyucheng@kylinsec.com.cn> - 2.9.3-5
|
||||
- KYOS-F: fix fake date error & fix description error
|
||||
|
||||
* Tue Feb 07 2023 wangxiaoqing <wangxiaoqing@kylinsec.com.cn> - 2.9.3-4
|
||||
- KYOS-B: Add the yaml file (#I4ZQLB)
|
||||
|
||||
* Tue Feb 07 2023 wangxiaoqing <wangxiaoqing@kylinsec.com.cn> - 2.9.3-3
|
||||
- KYOS-B: Delete the git directory in the source package (#I6CNEL)
|
||||
|
||||
* Thu Dec 01 2022 wangxiaoqing <wangxiaoqing@kylinsec.com.cn> - 2.9.3-2
|
||||
- KYOS-B: Adjust for LANG GB18030 (#I60PNN)
|
||||
|
||||
* 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
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
version_control: github
|
||||
src_repo: https://github.com/yetist/lunar-date.git
|
||||
tag_prefix: "v"
|
||||
seperator: "."
|
||||
Loading…
x
Reference in New Issue
Block a user