diff --git a/ukui-power-manager-3.1.1.tar.gz b/ukui-power-manager-3.1.1.tar.gz deleted file mode 100644 index 334159a02a47983f072a7d3e85f674b010ea16f8..0000000000000000000000000000000000000000 Binary files a/ukui-power-manager-3.1.1.tar.gz and /dev/null differ diff --git a/ukui-power-manager-3.1.2-fix-default-power-setting.patch b/ukui-power-manager-3.1.2-fix-default-power-setting.patch new file mode 100644 index 0000000000000000000000000000000000000000..09e50700e721141f1ee99e1c468e9cc04b2da93d --- /dev/null +++ b/ukui-power-manager-3.1.2-fix-default-power-setting.patch @@ -0,0 +1,12 @@ +diff -Naur ukui-power-manager-3.1.2/data/org.ukui.power-manager.gschema.xml.in ukui-power-manager-3.1.2~/data/org.ukui.power-manager.gschema.xml.in +--- ukui-power-manager-3.1.2/data/org.ukui.power-manager.gschema.xml.in 2021-11-10 15:28:04.000000000 +0800 ++++ ukui-power-manager-3.1.2~/data/org.ukui.power-manager.gschema.xml.in 2023-02-28 11:05:26.150101153 +0800 +@@ -309,7 +309,7 @@ + The amount of time in seconds the computer on battery power needs to be inactive before it goes to sleep. + + +- 900 ++ 0 + 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. + diff --git a/ukui-power-manager-3.1.2.tar.gz b/ukui-power-manager-3.1.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..34409c9046cbd1a801e565a2a917bd23f6708a22 Binary files /dev/null and b/ukui-power-manager-3.1.2.tar.gz differ diff --git a/ukui-power-manager.spec b/ukui-power-manager.spec index e8bee46433c11983ff385bc3b6462b5f7a64aac6..7898910b24e2f506e45330d03a71666e488ef570 100644 --- a/ukui-power-manager.spec +++ b/ukui-power-manager.spec @@ -1,16 +1,17 @@ -%define debug_package %{nil} Name: ukui-power-manager -Version: 3.1.1 -Release: 2 +Version: 3.1.2 +Release: 4 Summary: power management tool for the UKUI desktop -License: GPL-2+ LGPL-2+ GFDL-1.1+ +License: GPL-3+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz -BuildRequires: qt5-qtbase-devel,intltool,libcanberra-devel,dbus-glib-devel,libgcrypt-devel,glib2-devel,gtk3-devel,libnotify-devel,libtool, libtool-ltdl,upower-devel,libwnck3-devel,libX11-devel,libXext-devel,perl-XML-Parser,libXrandr-devel,pkg-config,xmlto,yelp-tools,qt5-qtcharts-devel,qt5-qtx11extras-devel,gsettings-qt-devel, gnome-keyring, libgnome-keyring-devel ,qt5-qtx11extras-devel, qt5-qttools-devel kf5-kwindowsystem-devel -BuildRequires:mate-common >= 1.18 +Patch01: ukui-power-manager-3.1.2-fix-default-power-setting.patch + +BuildRequires: qt5-qtbase-devel, qt5-qttools-devel, ukui-interface, glib2-devel, upower-devel, libX11-devel, libXext-devel, perl-XML-Parser, libXrandr-devel, pkg-config, gsettings-qt-devel, kf5-kwindowsystem-devel, qt5-qtx11extras-devel libkysdk-qtwidgets-devel chrpath + +Requires: dbus-x11,systemd,upower -Requires: dbus-x11,notification-daemon,polkit-qt5-1,systemd,upower %description UKUI Power Manager is a session daemon for the UKUI desktop that takes care of system or desktop events related to power, and @@ -23,11 +24,11 @@ events, all integrated to other components of the UKUI desktop. %prep -%setup -q +%autosetup -n %{name}-%{version} -p1 %build -qmake-qt5 -%{make_build} -j32 +%{qmake_qt5} +%{make_build} %install %{make_install} INSTALL_ROOT=%{buildroot} @@ -45,9 +46,15 @@ gzip -c %{_builddir}/%{name}-%{version}/man/ukui-power-manager.2 > %{buildroot} 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 +chrpath -d %{buildroot}/usr/bin/ukui-power-manager-tray + %clean rm -rf $RPM_BUILD_ROOT +%post +set -e +glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||: + %files %{_sysconfdir}/dbus-1/system.d/org.ukui.powermanagement.conf %{_sysconfdir}/xdg/autostart/ukui-power-manager-tray.desktop @@ -61,21 +68,61 @@ rm -rf $RPM_BUILD_ROOT %{_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/ukui-power-manager-tray_bo.qm -%{_datadir}/ukui-power-manager/tray/translations/ukui-power-manager-tray_tr.qm -%{_datadir}/ukui-power-manager/tray/translations/ukui-power-manager-tray_zh_CN.qm +%{_datadir}/ukui-power-manager/tray/translations/*.qm +%{_datadir}/ukui-power-manager/daemon/translations/*.qm %{_datadir}/man/* %changelog -* Fri Feb 25 2022 huayadong - 3.1.1-2 -- 删除无用依赖 +* Wed Mar 01 2023 peijiankang - 3.1.2-4 +- remove rpath of ukui-power-manager-tray + +* Tue Feb 28 2023 douyan - 3.1.2-3 +- add ukui-power-manager-3.1.2-fix-default-power-setting.patch + +* Thu Feb 09 2023 peijiankang - 3.1.2-2 +- add build debuginfo and debugsource + +* Tue Dec 6 2022 peijiankang - 3.1.2-1 +- update version to 3.1.2 + +* Tue Aug 02 2022 tanyulong - 2.0.3-13 +- static applet uses UseHighDpiPixmaps + +* Mon Aug 01 2022 tanyulong - 2.0.3-12 +- use attribute of UseHighDpiPixmaps + +* Mon Aug 01 2022 tanyulong - 2.0.3-11 +- delete power statistics directory -* Fri Feb 25 2022 huayadong - 3.1.1-1 -- update to upstream version 3.1.1-1 +* Fri Jul 29 2022 tanyulong - 2.0.3-10 +- log printing error correction + +* Wed Jun 29 2022 huayadong - 2.0.3-9 +- Update change control copyright and fix the spelling + +* Fri May 20 2022 tanyulong - 2.0.3-8 +- Improve the project according to the requirements of compliance improvement + +* Wed Apr 06 2022 huayadong - 2.0.3-7 +- some project changes + +* Tue Nov 09 2021 tanyulong - 2.0.3-6 +- add man files + +* Mon Nov 08 2021 tanyulong - 2.0.3-5 +- update copyright + +* Mon Nov 1 2021 tanyulong - 2.0.3-4 +- Add Tibetan translation + +* Mon Nov 1 2021 tanyulong - 2.0.3-3 +- Add .gitattributes file + +* Thu Oct 28 2021 tanyulong -2.0.3-2 +- fix Log print error correction * Mon Oct 26 2020 douyan - 2.0.3-1 - update to upstream version 2.0.2-1+1028 * Thu Jul 9 2020 douyan - 2.0.2-1 - Init package for openEuler - diff --git a/ukui-power-manager.yaml b/ukui-power-manager.yaml new file mode 100644 index 0000000000000000000000000000000000000000..bfe128786c336fd899d9c906ffb1502e5fda0e2f --- /dev/null +++ b/ukui-power-manager.yaml @@ -0,0 +1,5 @@ +version_control: github +src_repo: UKUI/ukui-power-manager +tag_prefix: "^v" +separator: "." +