diff --git a/0001-fix-translate_generation.sh.patch b/0001-fix-translate_generation.sh.patch deleted file mode 100644 index 3d62a3f2c8feacbabf9599e8547d6a412f4b2ce9..0000000000000000000000000000000000000000 --- a/0001-fix-translate_generation.sh.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a46ca5fa4b487026c8e8ec581d916b054a9227e0 Mon Sep 17 00:00:00 2001 -From: huayadong -Date: Sun, 7 Apr 2024 23:45:32 +0800 -Subject: [PATCH] fix translate_generation.sh - ---- - plugin-power/translate_generation.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugin-power/translate_generation.sh b/plugin-power/translate_generation.sh -index 72f748b..6ab2acc 100755 ---- a/plugin-power/translate_generation.sh -+++ b/plugin-power/translate_generation.sh -@@ -10,6 +10,6 @@ do - if [ "$version" == "fedora" ] || [ "$version" == "opensuse-leap" ] || [ "$version" == "opensuse-tumbleweed" ];then - lrelease-qt5 "${ts}" - else -- lrelease "${ts}" -+ lrelease-qt5 "${ts}" - fi - done --- -2.33.0 - diff --git a/0001-ukui-power-manager-default-to-never-sleep-computer.patch b/0001-ukui-power-manager-default-to-never-sleep-computer.patch new file mode 100644 index 0000000000000000000000000000000000000000..9547ec0a499a35e5e7ad028ef56f2bf7171af091 --- /dev/null +++ b/0001-ukui-power-manager-default-to-never-sleep-computer.patch @@ -0,0 +1,32 @@ +From d6b9295f173e88531eed161be91f0c1f6bf802b6 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Fri, 25 Oct 2024 10:13:41 +0800 +Subject: [PATCH] ukui-power-manager: default to never sleep computer + +Signed-off-by: Super User +--- + .../resources/org.ukui.power-manager.gschema.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/PowerManagementDaemon/resources/org.ukui.power-manager.gschema.xml b/PowerManagementDaemon/resources/org.ukui.power-manager.gschema.xml +index d2077d4..d270f18 100644 +--- a/PowerManagementDaemon/resources/org.ukui.power-manager.gschema.xml ++++ b/PowerManagementDaemon/resources/org.ukui.power-manager.gschema.xml +@@ -303,12 +303,12 @@ + The time remaining in seconds of the battery when critical action is taken. Only valid when use-time-for-policy is true. + + +- 900 ++ -1 + Sleep timeout computer when on battery + The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. + + +- 900 ++ -1 + Sleep timeout computer when on AC + The amount of time in seconds the computer on AC power needs to be inactive before it goes to sleep. + +-- +2.43.0 + diff --git a/0001-ukui-power-manager-enable-power-plugin.patch b/0001-ukui-power-manager-enable-power-plugin.patch new file mode 100644 index 0000000000000000000000000000000000000000..f1ecbc1aeb19abf6811d61e6a89a408b5861f4ea --- /dev/null +++ b/0001-ukui-power-manager-enable-power-plugin.patch @@ -0,0 +1,30 @@ +From 802cf02eb54867ef3364b7ddb7fb443bcd62b2a0 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Fri, 25 Oct 2024 11:42:33 +0800 +Subject: [PATCH] ukui-power-manager: enable power plugin + +Signed-off-by: Super User +--- + plugin-power/power.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/plugin-power/power.cpp b/plugin-power/power.cpp +index bf5f506..6f5639d 100644 +--- a/plugin-power/power.cpp ++++ b/plugin-power/power.cpp +@@ -151,9 +151,12 @@ QString Power::translationPath() const + + bool Power::isEnable() const + { ++ return true; ++ /* + QString cloudPlatForm = QString(QLatin1String(kdk_system_get_hostCloudPlatform())); + QString hostType = QString(QLatin1String(kdk_system_get_hostVirtType())); + return !(cloudPlatForm == "huawei" || cloudPlatForm == "ctyun" || hostType != "none"); ++ */ + } + + void Power::checkMachineType() +-- +2.43.0 + diff --git a/ukui-power-manager-4.0.0.0.tar.gz b/ukui-power-manager-4.0.0.0.tar.gz deleted file mode 100644 index 515ec9c8ad223d070b45574ddd3af0a3f80e8389..0000000000000000000000000000000000000000 Binary files a/ukui-power-manager-4.0.0.0.tar.gz and /dev/null differ diff --git a/ukui-power-manager-4.10.0.0.tar.gz b/ukui-power-manager-4.10.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..bb33361249948c7695727d5d6d3432ccdfeaff77 Binary files /dev/null and b/ukui-power-manager-4.10.0.0.tar.gz differ diff --git a/ukui-power-manager.spec b/ukui-power-manager.spec index 8bffb1de1dd1c2a6dc8f15854aad5a13840a50cc..58a30e1a267bd4aa549ae925ee6acb115a5c6c46 100644 --- a/ukui-power-manager.spec +++ b/ukui-power-manager.spec @@ -1,47 +1,44 @@ -Name: ukui-power-manager -Version: 4.0.0.0 -Release: 1 -Summary: power management tool for the UKUI desktop -License: GPL-3+ -URL: http://www.ukui.org -Source0: %{name}-%{version}.tar.gz - - -Patch01: 0001-fix-translate_generation.sh.patch - -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qttools-devel -BuildRequires: ukui-interface -BuildRequires: glib2-devel -BuildRequires: upower-devel -BuildRequires: libX11-devel -BuildRequires: libXext-devel -BuildRequires: perl-XML-Parser -BuildRequires: libXrandr-devel -BuildRequires: pkg-config -BuildRequires: gsettings-qt-devel -BuildRequires: kf5-kwindowsystem-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: libkysdk-qtwidgets-devel -BuildRequires: libkysdk-sysinfo-devel -BuildRequires: libkysdk-diagnostics-devel -BuildRequires: libukcc-devel -BuildRequires: libkysdk-waylandhelper-devel -BuildRequires: pciutils-devel -BuildRequires: chrpath - -Requires: dbus-x11,systemd,upower - +Summary: power management tool for the UKUI desktop +Name: ukui-power-manager +Version: 4.10.0.0 +Release: 1 +License: GPL-3+ +URL: http://www.ukui.org/ +Source0: %{name}-%{version}.tar.gz +Patch01: 0001-ukui-power-manager-default-to-never-sleep-computer.patch +Patch02: 0001-ukui-power-manager-enable-power-plugin.patch + +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: libukui-log4qt-devel +BuildRequires: glib2-devel +BuildRequires: upower-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: perl-XML-Parser +BuildRequires: libXrandr-devel +BuildRequires: pkg-config +BuildRequires: gsettings-qt-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: libkysdk-qtwidgets-devel +BuildRequires: libkysdk-sysinfo-devel +BuildRequires: libkysdk-diagnostics-devel +BuildRequires: libukcc-devel +BuildRequires: libkysdk-waylandhelper-devel >= 1.2.0kylin2 +BuildRequires: pciutils-devel +BuildRequires: libkysdk-soundeffects-devel +BuildRequires: qtchooser + + +Requires: dbus-x11 +Requires: systemd +Requires: upower qtchooser + +Obsoletes: ukui-power-manager-common +Conflicts: ukui-control-center < 3.22.1.25 %description -UKUI Power Manager is a session daemon for the UKUI desktop -that takes care of system or desktop events related to power, and -triggers actions accordingly. Its philosophy is to completely hide -these complex tasks and only show some settings important to the user. -The UKUI power manager displays and manages battery status, power plug -events, display brightness, CPU, graphics card and hard disk drive -power saving, and can trigger suspend-to-RAM, hibernate or shutdown -events, all integrated to other components of the UKUI desktop. - + UKUI Power Manager is a session daemon for the UKUI desktop that takes care of system or desktop events related to power, and triggers actions accordingly. Its philosophy is to completely hide these complex tasks and only show some settings important to the user. . The UKUI power manager displays and manages battery status, power plug events, display brightness, CPU, graphics card and hard disk drive power saving, and can trigger suspend-to-RAM, hibernate or shutdown events, all integrated to other components of the UKUI desktop. %prep %autosetup -n %{name}-%{version} -p1 @@ -51,50 +48,53 @@ events, all integrated to other components of the UKUI desktop. %{make_build} %install -%{make_install} INSTALL_ROOT=%{buildroot} - -mkdir -p %{buildroot}/usr/lib/udev/rules.d -cp -r %{_builddir}/%{name}-%{version}/data/99-upower-wake-up-usb-device.rules %{buildroot}/usr/lib/udev/rules.d/ +make INSTALL_ROOT=%{buildroot} install -mkdir -p %{buildroot}/usr/share/man/man1 -mkdir -p %{buildroot}/usr/share/man/man2 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man1/ +gzip man/* +cp man/ukui*.1.gz $RPM_BUILD_ROOT%{_datadir}/man/man1/ -gzip -c %{_builddir}/%{name}-%{version}/man/ukui-powermanagement.1 > %{buildroot}/usr/share/man/man1/ukui-powermanagement.1.gz -gzip -c %{_builddir}/%{name}-%{version}/man/ukui-powermanagement-service.1 > %{buildroot}/usr/share/man/man1/ukui-powermanagement-service.1.gz -gzip -c %{_builddir}/%{name}-%{version}/man/ukui-power-manager.1 > %{buildroot}/usr/share/man/man1/ukui-power-manager.1.gz -gzip -c %{_builddir}/%{name}-%{version}/man/ukui-power-manager.2 > %{buildroot}/usr/share/man/man2/ukui-power-manager.2.gz -gzip -c %{_builddir}/%{name}-%{version}/man/ukui-power-manager-tray.1 > %{buildroot}/usr/share/man/man1/ukui-power-manager-tray.1.gz -gzip -c %{_builddir}/%{name}-%{version}/man/ukui-upower.1 > %{buildroot}/usr/share/man/man1/ukui-upower.1.gz +mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man2/ +cp man/ukui*.2.gz $RPM_BUILD_ROOT%{_datadir}/man/man2/ -chrpath -d %{buildroot}/usr/bin/ukui-power-manager-tray - -%clean -rm -rf $RPM_BUILD_ROOT %post +#!/bin/sh set -e -glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: +glib-compile-schemas /usr/share/glib-2.0/schemas/ +#DEBHELPER# + %files +%license debian/copyright +%doc debian/changelog %{_sysconfdir}/dbus-1/system.d/org.ukui.powermanagement.conf %{_sysconfdir}/xdg/autostart/ukui-power-manager-tray.desktop %{_sysconfdir}/xdg/autostart/ukui-powermanagement-daemon.desktop %{_bindir}/ukui-power-manager-tray %{_bindir}/ukui-powermanagement %{_bindir}/ukui-powermanagement-service -%{_prefix}/lib/udev/rules.d/99-upower-wake-up-usb-device.rules +%{_libdir}/ukui-control-center/libpower.so %{_datadir}/X11/xorg.conf.d/10-monitor.conf %{_datadir}/dbus-1/system-services/org.ukui.powermanagement.service %{_datadir}/glib-2.0/schemas/org.ukui.power-manager.gschema.xml -%{_datadir}/ukui-power-manager/tray/translations/*.qm -%{_datadir}/ukui-power-manager/daemon/translations/*.qm -%{_datadir}/man/* -%{_sysconfdir}/ukui/ukui-power-manager/upm-global.conf -%{_libdir}/ukui-control-center/libpower.so +%{_datadir}/man/man1/* +%{_datadir}/man/man2/ukui-power-manager.2.gz +%{_datadir}/ukui/ukui-power-manager/* +%{_datadir}/ukui-power-manager/daemon/translations/* %{_datadir}/ukui-power-manager/power-plugin/translations/* +%{_datadir}/ukui-power-manager/tray/translations/* + + %changelog +* Tue Aug 19 2025 huayadong - 4.10.0.0-1 +- Type: update +- ID : NA +- SUG : NA +- DESC: Update upstream version 4.10.0.0-ok1.33 + * Mon Apr 08 2024 huayadong - 4.0.0.0-1 - update version to 4.0.0.0