Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
2861f44599
!15 fix fake date & description error
From: @wangyucheng1 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
2023-04-13 05:19:08 +00:00
wangyucheng
597502668d fix fake date error & fix description error
- 修复 虚假日期 和 描述 的错误

Signed-off-by: wangyucheng <wangyucheng@kylinsec.com.cn>
2023-04-12 05:22:06 -04:00
openeuler-ci-bot
7326ee7643
!14 添加yaml文件
From: @wangxiaoqing987 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
2023-02-13 02:03:10 +00:00
wangxiaoqing
313815c74c Add the yaml file
- 添加yaml文件

Signed-off-by: wangxiaoqing <wangxiaoqing@kylinsec.com.cn>
2023-02-07 16:47:24 +08:00
openeuler-ci-bot
4d9432f7c9
!13 删除源代码压缩包中多余的git目录
From: @wangxiaoqing987 
Reviewed-by: @liubuguiii 
Signed-off-by: @liubuguiii
2023-02-07 08:19:45 +00:00
wangxiaoqing
b619079c63 Delete the git directory in the source package
- 删除源代码压缩包中的git目录, 源码中不应该包含项目中git信息。保留该目录会导致rpmbuild的git处理过程失败, 因此删除掉git目录

Signed-off-by: wangxiaoqing <wangxiaoqing@kylinsec.com.cn>
2023-02-07 15:50:50 +08:00
openeuler-ci-bot
e9143d690e
!10 修复18030编码乱码问题
From: @wangxiaoqing987 
Reviewed-by: @tangjie02 
Signed-off-by: @tangjie02
2022-12-01 09:37:43 +00:00
wangxiaoqing
ba7514f6a8 Adjust for LANG GB18030
- 适配18030编码,避免乱码

Signed-off-by: wangxiaoqing <wangxiaoqing@kylinsec.com.cn>
2022-12-01 14:29:51 +08:00
openeuler-ci-bot
8bc6c65c43 !6 Add Requires lunar-date for lunar-date-devel
From: @tangjie02
Reviewed-by: @doudou19
Signed-off-by: @doudou19
2021-10-25 10:35:32 +00:00
tangjie02
bf148a4b15 Add Requires lunar-date for lunar-date-devel
- 对lunar-date-devel添加lunar-date依赖

Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
2021-10-25 17:44:43 +08:00
4 changed files with 32 additions and 45 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

Binary file not shown.

View File

@ -21,14 +21,11 @@ Version: 2.9.3
%define _libver 3_0 %define _libver 3_0
Release: 1.9%{?dist}.kb1 Release: 5
License: GPL-2.0+ License: GPL-2.0+
Group: System/I18n/Chinese Group: System/I18n/Chinese
Url: http://liblunar.googlecode.com/ Url: http://liblunar.googlecode.com/
Source: https://liblunar.googlecode.com/files/%{name}-%{version}.tar.gz 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: gobject-introspection-devel intltool
BuildRequires: meson BuildRequires: meson
@ -44,36 +41,33 @@ Chinese Lunar calendar library
Summary: Chinese Lunar calendar introspection bindings Summary: Chinese Lunar calendar introspection bindings
Group: System/I18n/Chinese Group: System/I18n/Chinese
%description -n typelib-1_0-LunarDate-%{_libver}
Library to support date conversion from/to chinese lunar calendar
%package devel %package devel
Summary: Chinese Lunar calendar library development files Summary: Chinese Lunar calendar library development files
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: typelib-1_0-LunarDate-%{_libver} = %{version} Requires: typelib-1_0-LunarDate-%{_libver} = %{version}
Requires: lunar-date%{?_isa} = %{version}-%{release}
%description devel
Development files for Chinese Lunar calendar library
%package holiday %package holiday
Summary: Chinese Holiday definition Summary: Chinese Holiday definition
Group: System/I18n/Chinese Group: System/I18n/Chinese
BuildArch: noarch 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 %description holiday
Holiday definition file for Chinese Lunar calendar library Holiday definition file for Chinese Lunar calendar library
%prep %prep
%autosetup -p1 %autosetup -S git
%build %build
%meson -Denable_gtk_doc=true -Dwith_introspection=true -Dwith_vala=false -Denable_tests=true %meson -Denable_gtk_doc=true -Dwith_introspection=true -Dwith_vala=false -Denable_tests=true -Dc_args="$CFLAGS -DHAVE_BIND_TEXTDOMAIN_CODESET"
%meson_build %meson_build
%install %install
%meson_install %meson_install
%find_lang %{name} %find_lang %{name}
@ -108,5 +102,23 @@ Holiday definition file for Chinese Lunar calendar library
%{_datadir}/gtk-doc/html/%{name} %{_datadir}/gtk-doc/html/%{name}
%changelog %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 * Thu Jul 02 2020 wangxiaoqing <wangxiaoqing@kylinos.com.cn> 2.9.3
- KYOS-F: liblunar-date, version 2.9.3 Related #27425 - KYOS-F: liblunar-date, version 2.9.3 Related #27425

4
lunar-date.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: https://github.com/yetist/lunar-date.git
tag_prefix: "v"
seperator: "."