Compare commits

..

No commits in common. "b65e0536cea6036a890f49b1b8945f3acc5f75af" and "cc0a02de3a4e0e871f29abacace91807a601a983" have entirely different histories.

5 changed files with 61 additions and 30 deletions

View File

@ -0,0 +1,49 @@
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,12 +1,13 @@
%define debug_package %{nil}
Name: ukui-clock Name: ukui-clock
Version: 3.1.3 Version: 3.0.1
Release: 3 Release: 2
Summary: contain clock alarm,stopwatch,countdown Summary: contain clock alarm,stopwatch,countdown
License: GPL-3.0+ License: GPL-2.1+ and GPL-3.0+
URL: http://www.ukui.org URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.xz 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: glib2-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
@ -24,9 +25,6 @@ BuildRequires: pkgconf
BuildRequires: libXrandr-devel BuildRequires: libXrandr-devel
BuildRequires: libXinerama-devel BuildRequires: libXinerama-devel
BuildRequires: libXcursor-devel BuildRequires: libXcursor-devel
BuildRequires: mpv-libs-devel
BuildRequires: ffmpeg-devel
BuildRequires: qt5-qtscript-devel
BuildRequires: ukui-interface BuildRequires: ukui-interface
@ -34,40 +32,28 @@ BuildRequires: ukui-interface
contain clock alarm,stopwatch,countdown contain clock alarm,stopwatch,countdown
%prep %prep
%autosetup -n %{name}-%{version} -p1 %setup -q
%patch01 -p1
%build %build
mkdir build && cd build mkdir build && cd build
%{qmake_qt5} .. qmake-qt5 ..
%{make_build} make -j4
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
cd %{_builddir}/%{name}-%{version}/build cd %{_builddir}/%{name}-%{version}/build
%{make_install} INSTALL_ROOT=%{buildroot} make INSTALL_ROOT=%{buildroot} install
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%{_bindir}/ukui-clock %{_bindir}/ukui-clock
%{_datadir}/applications/ukui-clock.desktop %{_datadir}/applications/ukui-clock.desktop
%{_datadir}/ukui-clock %{_datadir}/ukui-clock
%{_datadir}/kylin-user-guide/data/*
%changelog %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 * Mon Aug 8 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.1-2
- modify the error version of ukui-clock - modify the error version of ukui-clock

View File

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