diff --git a/0001-fix-time-shutdown-coredump.patch b/0001-fix-time-shutdown-coredump.patch deleted file mode 100644 index a4b7bba7a40aa1e7ff8e5b85758d5f1cef4fec21..0000000000000000000000000000000000000000 --- a/0001-fix-time-shutdown-coredump.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0593828f399543eff2da150c4589e7e4af66978d Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Wed, 1 Mar 2023 10:32:07 +0800 -Subject: [PATCH] dddd - ---- - src/widget.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/widget.cpp b/src/widget.cpp -index f288c91..852d7ae 100644 ---- a/src/widget.cpp -+++ b/src/widget.cpp -@@ -43,7 +43,7 @@ Widget::Widget(QWidget *parent) - initGsetting(); - - // 根据版本设置gsetting值 -- getTimeShutdownVersion(); -+// getTimeShutdownVersion(); - - // 创建当前动作 - createActions(); --- -2.36.1 - diff --git a/add_desktop_file.patch b/add_desktop_file.patch deleted file mode 100644 index 14d79389c50af73f6080fa98250bcef12f6dbc1e..0000000000000000000000000000000000000000 --- a/add_desktop_file.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur time-shutdown-1.1.1/time-shutdown.pro time-shutdown-1.1.1~/time-shutdown.pro ---- time-shutdown-1.1.1/time-shutdown.pro 2021-11-04 16:30:10.000000000 +0800 -+++ time-shutdown-1.1.1~/time-shutdown.pro 2022-03-04 14:27:52.702298450 +0800 -@@ -42,11 +42,11 @@ - schemes.files += data/org.ukui.time.shutdown.settings.gschema.xml - schemes.path = /usr/share/glib-2.0/schemas/ - --#desktopfile.files = data/ukui-time-shotdown.desktop --#desktopfile.path = /usr/share/applications/ -+desktopfile.files = data/ukui-time-shotdown.desktop -+desktopfile.path = /usr/share/applications/ - - target.path = /usr/bin/ - --INSTALLS += target schemes translation -+INSTALLS += target schemes translation desktopfile - # Default rules for deployment. - diff --git a/time-shutdown-1.1.2.tar.gz b/time-shutdown-1.1.2.tar.gz deleted file mode 100644 index f147ff5a5118468740f847e0eb6879a657774758..0000000000000000000000000000000000000000 Binary files a/time-shutdown-1.1.2.tar.gz and /dev/null differ diff --git a/time-shutdown-4.0.0.0.tar.gz b/time-shutdown-4.0.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f83b1ba2ceedfd5892b5c8bf84366438f2518ffe Binary files /dev/null and b/time-shutdown-4.0.0.0.tar.gz differ diff --git a/time-shutdown.spec b/time-shutdown.spec index 3ca438eca33f5eead64ad3364fa435103c7a7f37..56b7f58fbb5f7c29669592b045a72cb351cf4733 100644 --- a/time-shutdown.spec +++ b/time-shutdown.spec @@ -1,29 +1,27 @@ Name: time-shutdown -Version: 1.1.2 -Release: 2 +Version: 4.0.0.0 +Release: 1 Summary: The time-shutdown is mainly used in the desktop operating system License: GPL-3+ URL: https://github.com/ukui/time-shutdown Source0: %{name}-%{version}.tar.gz +BuildRequires: glib2-devel BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtsvg-devel -BuildRequires: glib2-devel +BuildRequires: qt5-qttools-devel BuildRequires: gsettings-qt-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: libkysdk-qtwidgets-devel +BuildRequires: libkysdk-ukenv-devel BuildRequires: libX11-devel -Requires: gsettings-qt -Requires: libX11 -Requires: ukui-notification-daemon - -Patch0: add_desktop_file.patch -Patch1: 0001-fix-time-shutdown-coredump.patch %description - The time-shutdown is mainly used in the desktop operating system. - Timed shutdown program The shutdown frequency can be selected. - When the time is set, the shutdown interface will be triggered - and a notification popup will be sent. You can select, postpone and set. +The time-shutdown is mainly used in the desktop operating system. +Timed shutdown program The shutdown frequency can be selected. +When the time is set, the shutdown interface will be triggered +and a notification popup will be sent. You can select, postpone and set. %prep %autosetup -p1 @@ -44,13 +42,17 @@ popd %files %doc debian/changelog %license debian/copyright -%{_bindir}/* -%{_datadir}/applications/ukui-time-shotdown.desktop +%{_sysconfdir}/xdg/autostart/time-shutdown-daemon.desktop +%{_bindir}/time-shutdown +%{_bindir}/time-shutdown-daemon %{_datadir}/glib-2.0/schemas/org.ukui.time.shutdown.settings.gschema.xml -%{_datadir}/ukui-time-shutdown/time-shutdown_zh_CN.qm -%{_datadir}/ukui-time-shutdown/ukui-time-shutdown_bo_CN.qm +%{_datadir}/kylin-user-guide/data/guide/time-shutdown +%{_datadir}/ukui-time-shutdown/translations %changelog +* Mon Apr 08 2024 peijiankang - 4.0.0.0-1 +- update version to 4.0.0.0 from openkylin + * Wed Mar 1 2023 huayadong - 1.1.2-2 - fix time shutdown coredump