Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
b65e0536ce
!11 delete Delete unused
From: @hua_yadong 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2024-04-22 08:56:27 +00:00
huayadong
388aaae775 delete Delete unused 2024-04-16 17:34:52 +08:00
openeuler-ci-bot
0a88e593d0
!7 add build debuginfo and debugsource
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2023-02-08 09:10:11 +00:00
peijiankang
79abf7338a add build debuginfo and debugsource 2023-02-08 14:37:17 +08:00
openeuler-ci-bot
30795cc9c5
!6 update version to 3.1.3
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-12-05 09:14:56 +00:00
peijiankang
15a3fcf47a update version to 3.1.3 2022-12-05 16:03:31 +08:00
openeuler-ci-bot
ef463963c6
!5 update license
From: @jackssir 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-11-04 01:05:58 +00:00
lvfei
97e9d751d7 update license from openkylin 2022-10-28 02:57:33 -04:00
openeuler-ci-bot
c837e404ae
!4 ukui clock add yaml file
From: @jackssir 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-10-28 06:03:51 +00:00
lvfei
9d923e1881 ukui clock add yaml file 2022-10-26 22:05:15 -04:00
5 changed files with 30 additions and 61 deletions

Binary file not shown.

View File

@ -1,49 +0,0 @@
From 26c21cea61c43db986817d8be4a25642b46e0fc7 Mon Sep 17 00:00:00 2001
From: peijiankang <peijiankang@kylinos.cn>
Date: Tue, 2 Aug 2022 09:26:38 +0800
Subject: [PATCH] modify the error version of ukui-clock
---
about.cpp | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/about.cpp b/about.cpp
index 08b081c..e699d2a 100644
--- a/about.cpp
+++ b/about.cpp
@@ -38,7 +38,31 @@ About::About(QWidget *parent) :
ui->appnameLabel->setText(tr(KYLIN_CLOCK_APP_NAME));
ui->appnameLabel->setStyleSheet("QLabel{ font-size: 18px; color: palette(windowText);}"
"QLabel{font-family: NotoSansCJKsc-Medium, NotoSansCJKsc;}");
- ui->versionLabel->setText(tr("Version: ")+"2021.2.0");
+
+ QString appVersion = "2021.2.0";
+ FILE *pp = NULL;
+ char *line = NULL;
+ char *q = NULL;
+ size_t len = 0;
+ ssize_t read;
+
+ pp = popen("rpm -q ukui-clock", "r");
+ if(pp) { while((read = getline(&line, &len, pp)) != -1){
+ q = strrchr(line, '\n');
+ *q = '\0';
+ QString content = line;
+ QStringList list = content.split("-");
+ if (list.size() >= 3)
+ appVersion = list.at(2);
+ }
+ }
+ if(line){
+ free(line);
+ line = NULL;
+ }
+ pclose(pp);
+
+ ui->versionLabel->setText(tr("Version: ")+ appVersion);
settingsStyle();
//中间大图标
ui->appiconLabel->setPixmap(QIcon::fromTheme("kylin-alarm-clock").pixmap(96,96));
--
2.33.0

View File

@ -1,13 +1,12 @@
%define debug_package %{nil}
Name: ukui-clock
Version: 3.0.1
Release: 2
Version: 3.1.3
Release: 3
Summary: contain clock alarm,stopwatch,countdown
License: GPL-2.1+ and GPL-3.0+
License: GPL-3.0+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.xz
Patch01: 0001-modify-the-error-version-of-ukui-clock.patch
Patch01: 0001-delete-Delete-unused-files.patch
BuildRequires: glib2-devel
BuildRequires: qt5-qtbase-devel
@ -25,6 +24,9 @@ BuildRequires: pkgconf
BuildRequires: libXrandr-devel
BuildRequires: libXinerama-devel
BuildRequires: libXcursor-devel
BuildRequires: mpv-libs-devel
BuildRequires: ffmpeg-devel
BuildRequires: qt5-qtscript-devel
BuildRequires: ukui-interface
@ -32,18 +34,17 @@ BuildRequires: ukui-interface
contain clock alarm,stopwatch,countdown
%prep
%setup -q
%patch01 -p1
%autosetup -n %{name}-%{version} -p1
%build
mkdir build && cd build
qmake-qt5 ..
make -j4
%{qmake_qt5} ..
%{make_build}
%install
rm -rf $RPM_BUILD_ROOT
cd %{_builddir}/%{name}-%{version}/build
make INSTALL_ROOT=%{buildroot} install
%{make_install} INSTALL_ROOT=%{buildroot}
%clean
rm -rf $RPM_BUILD_ROOT
@ -52,8 +53,21 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/ukui-clock
%{_datadir}/applications/ukui-clock.desktop
%{_datadir}/ukui-clock
%{_datadir}/kylin-user-guide/data/*
%changelog
* Thu Apr 18 2024 huayadong <huayadong@kylinos.cn> - 3.1.3-3
- Delete unused files
* Wed Feb 08 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.3-2
- add build debuginfo and debugsource
* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.3-1
- update version to 3.1.3
* Fri Oct 28 2022 lvfei <lvfei@kylinos.cn> - 3.0.1-3
- update license from https://gitee.com/openkylin/ukui-clock
* Mon Aug 8 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.1-2
- modify the error version of ukui-clock

4
ukui-clock.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: UbuntuKylin/ukui-clock
tag_prefix: "^v"
separator: ".