diff --git a/0001-modify-the-error-version-of-ukui-clock.patch b/0001-modify-the-error-version-of-ukui-clock.patch deleted file mode 100644 index 03842b3..0000000 --- a/0001-modify-the-error-version-of-ukui-clock.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 26c21cea61c43db986817d8be4a25642b46e0fc7 Mon Sep 17 00:00:00 2001 -From: peijiankang -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 - diff --git a/ukui-clock-3.0.1.tar.xz b/ukui-clock-3.1.3.tar.xz similarity index 55% rename from ukui-clock-3.0.1.tar.xz rename to ukui-clock-3.1.3.tar.xz index 4ffb942..0153431 100644 Binary files a/ukui-clock-3.0.1.tar.xz and b/ukui-clock-3.1.3.tar.xz differ diff --git a/ukui-clock.spec b/ukui-clock.spec index dc42a5f..01135e1 100644 --- a/ukui-clock.spec +++ b/ukui-clock.spec @@ -1,13 +1,12 @@ %define debug_package %{nil} Name: ukui-clock -Version: 3.0.1 -Release: 3 +Version: 3.1.3 +Release: 1 Summary: contain clock alarm,stopwatch,countdown License: GPL-3.0+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.xz -Patch01: 0001-modify-the-error-version-of-ukui-clock.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 @@ -33,7 +35,6 @@ contain clock alarm,stopwatch,countdown %prep %setup -q -%patch01 -p1 %build mkdir build && cd build @@ -52,8 +53,12 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/ukui-clock %{_datadir}/applications/ukui-clock.desktop %{_datadir}/ukui-clock +%{_datadir}/kylin-user-guide/data/* %changelog +* Mon Dec 5 2022 peijiankang - 3.1.3-1 +- update version to 3.1.3 + * Fri Oct 28 2022 lvfei - 3.0.1-3 - update license from https://gitee.com/openkylin/ukui-clock