From 833ae0b0c3f330f6a9765be8893a6e60de24aea1 Mon Sep 17 00:00:00 2001 From: dou33 Date: Mon, 6 Sep 2021 15:18:48 +0800 Subject: [PATCH] add fix_user_passwd_valid_time_setting_failed_issue.patch --- ...sswd_valid_time_setting_failed_issue.patch | 23 +++++++++++++++++++ ukui-control-center.spec | 8 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 fix_user_passwd_valid_time_setting_failed_issue.patch diff --git a/fix_user_passwd_valid_time_setting_failed_issue.patch b/fix_user_passwd_valid_time_setting_failed_issue.patch new file mode 100644 index 0000000..72c182b --- /dev/null +++ b/fix_user_passwd_valid_time_setting_failed_issue.patch @@ -0,0 +1,23 @@ +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 2019-05-27 15:48:18.000000000 +0800 ++++ ukui-control-center-3.0.1~/plugins/account/userinfo/changevaliddialog.cpp 2021-09-03 18:48:22.196993408 +0800 +@@ -155,8 +155,8 @@ + if (valid.startsWith(_name)){ + QStringList validList = valid.split(" "); + QString lastChangeStr = validList.at(2); +- QStringList lastChangeList = lastChangeStr.split("/"); +- lastChangeDate = QDate(QString(lastChangeList.at(2)).toInt(), QString(lastChangeList.at(0)).toInt(), QString(lastChangeList.at(1)).toInt()); ++ QStringList lastChangeList = lastChangeStr.split("-"); ++ lastChangeDate = QDate(QString(lastChangeList.at(0)).toInt(), QString(lastChangeList.at(1)).toInt(), QString(lastChangeList.at(2)).toInt()); + delayDays = QString(validList.at(4)).toInt(); + } else { + delayDays = -1; +@@ -201,7 +201,7 @@ + ui->yearCombox->clear(); + + QDate begin = QDate::currentDate().addDays(1); +- QDate canSelect = lastChangeDate.addYears(26); ++ QDate canSelect = lastChangeDate.addYears(70); + + ui->yearCombox->addItem(QObject::tr("Never"), 0); + for (int year = begin.year(); year <= canSelect.year(); year++){ diff --git a/ukui-control-center.spec b/ukui-control-center.spec index 78cd53e..9906824 100644 --- a/ukui-control-center.spec +++ b/ukui-control-center.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: ukui-control-center Version: 3.0.1 -Release: 16 +Release: 17 Summary: utilities to configure the UKUI desktop License: GPL-2+ URL: http://www.ukui.org @@ -85,6 +85,7 @@ patch12: 0012-window-add-title-icon.patch patch13: 0001-fix-compile-extern-C-error.patch patch14: fix_arm_root_user_crash.patch patch15: fix_add_group_failed_issue.patch +patch16: fix_user_passwd_valid_time_setting_failed_issue.patch Recommends: qt5-qtquickcontrols @@ -120,6 +121,8 @@ Suggests: ukui-settings-daemon %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 +%patch16 -p1 %build qmake-qt5 @@ -165,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/polkit-1/actions/org.ukui.groupmanager.policy %changelog +* Mon Sep 6 2021 douyan - 3.0.1-17 +- add fix_user_passwd_valid_time_setting_failed_issue.patch + * Thu Sep 2 2021 douyan - 3.0.1-16 - fix add group failed issue