!22 delete power statistics directory

From: @tanyulong2021 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2022-08-01 03:33:30 +00:00 committed by Gitee
commit 6abb173970
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From bd0fb53ed9a5afc96dce07276047ab31c5ed5ef4 Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Mon, 1 Aug 2022 10:35:08 +0800
Subject: [PATCH] delete power statistics directory
---
debian/rules | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/debian/rules b/debian/rules
index 02e7d99..1baae66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,8 @@ QT_INSTALL_DIR:=$(shell pwd)/debian/tmp/
dh $@
override_dh_install:
mkdir -p $(QT_INSTALL_DIR) && \
- make install INSTALL_ROOT=$(QT_INSTALL_DIR) -C ukui-power-statistics/build
make install INSTALL_ROOT=$(QT_INSTALL_DIR) -C ukui-power-manager-tray/build
+ make install INSTALL_ROOT=$(QT_INSTALL_DIR) -C ukui-power-policy/build
dh_install
override_dh_missing:
@@ -29,9 +29,6 @@ override_dh_auto_configure:
override_dh_auto_build:
dh_auto_build
- mkdir -p ukui-power-statistics/build
- cd ukui-power-statistics/build && qmake ../
- make -C ukui-power-statistics/build
mkdir -p ukui-power-manager-tray/build
cd ukui-power-manager-tray/build && qmake ../
make -C ukui-power-manager-tray/build
--
2.33.0

View File

@ -1,13 +1,14 @@
%define debug_package %{nil}
Name: ukui-power-manager
Version: 2.0.3
Release: 10
Release: 11
Summary: power management tool for the UKUI desktop
License: GPL-2.0-or-later and LGPL-2.0-or-later
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Patch0: 0001-Update-change-control-copyright-and-fix-the-spelling.patch
Patch1: 0002-log-printing-error-correction.patch
Patch2: 0003-delete-power-statistics-directory.patch
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
BuildRequires:mate-common >= 1.18
@ -46,6 +47,7 @@ This package contains the architecture independent files.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 -enable-introspection --enable-compile-warnings=yes --enable-egl-device --enable-wayland --enable-native-backend
@ -438,6 +440,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Aug 01 2022 tanyulong<tanyulong@kylinos.cn> - 2.0.3-11
- delete power statistics directory
* Fri Jul 29 2022 tanyulong<tanyulong@kylinos.cn> - 2.0.3-10
- log printing error correction