!54 update to version 3.0.1-19

From: @dou33
Reviewed-by: @tanyulong2021
Signed-off-by: @tanyulong2021
This commit is contained in:
openeuler-ci-bot 2021-09-16 12:46:07 +00:00 committed by Gitee
commit a9844724f8
3 changed files with 41 additions and 9 deletions

View File

@ -0,0 +1,12 @@
diff -Naur ukui-control-center-3.0.1/plugins/account/userinfo/changevaliddialog.cpp ukui-control-center-3.0.1~/plugins/account/userinfo/changevaliddialog.cpp
--- ukui-control-center-3.0.1/plugins/account/userinfo/changevaliddialog.cpp 2021-09-16 15:20:36.911428472 +0800
+++ ukui-control-center-3.0.1~/plugins/account/userinfo/changevaliddialog.cpp 2021-09-16 15:24:43.754446704 +0800
@@ -143,7 +143,7 @@
void ChangeValidDialog::_getCurrentPwdStatus(){
//
- QString cmd = "passwd -S " + _name;
+ QString cmd = "pkexec passwd -S " + _name;
QProcess * process = new QProcess;
process->start(cmd);

View File

@ -1,11 +1,12 @@
%define debug_package %{nil}
Name: ukui-control-center
Version: 3.0.1
Release: 18
Release: 19
Summary: utilities to configure the UKUI desktop
License: GPL-2+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
Source1: ukui-group-manager.desktop
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qtbase-devel
@ -87,6 +88,7 @@ patch14: fix_arm_root_user_crash.patch
patch15: fix_add_group_failed_issue.patch
patch16: fix_user_passwd_valid_time_setting_failed_issue.patch
patch17: 0013-cpuinfo-in-arm-system-is-null.patch
patch18: fix_user_passwd_valid_issue.patch
Recommends: qt5-qtquickcontrols
@ -125,6 +127,7 @@ Suggests: ukui-settings-daemon
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%build
qmake-qt5
@ -134,6 +137,9 @@ make
rm -rf $RPM_BUILD_ROOT
make INSTALL_ROOT=%{buildroot} install
mkdir -p %{buildroot}/etc/xdg/autostart/
cp -r %{SOURCE1} %{buildroot}/etc/xdg/autostart/
%post
set -e
glib-compile-schemas /usr/share/glib-2.0/schemas/
@ -141,14 +147,6 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/
chown root:root /usr/bin/checkuserpwd
chmod u+s /usr/bin/checkuserpwd
%systemd_post ukui-group-manager.service
%preun
%systemd_preun ukui-group-manager.service
%postun
%systemd_postun ukui-group-manager.service
%clean
rm -rf $RPM_BUILD_ROOT
@ -168,8 +166,12 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/checkuserpwd
%{_unitdir}/ukui-group-manager.service
%{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy
%{_sysconfdir}/xdg/autostart/ukui-group-manager.desktop
%changelog
* Thu Sep 16 2021 douyan <douyan@kylinos.cn> - 3.0.1-19
- add fix_user_passwd_valid_issue.patch
* Sat Sep 11 2021 peijiankang <peijiankang@kylinos.cn> - 3.0.1-18
- add 0013-cpuinfo-in-arm-system-is-null.patch

View File

@ -0,0 +1,18 @@
[Desktop Entry]
Name=ukui-group-manager
Comment=ukui-group-manager
Exec=/usr/bin/group-manager-server
Terminal=false
Type=Application
Keywords=UKUI;
NoDisplay=true
OnlyShowIn=UKUI;
X-UKUI-Autostart-Phase=Application
X-UKUI-Bugzilla-Bugzilla=UKUI
X-MATE-Autostart-Phase=Applications
X-KDE-autostart-after=panel
X-UKUI-Autostart-Notify=true
X-UKUI-Autostart-Delay=3
X-UKUI-AutoRestart=true