!5 update to version 3.0.1

Merge pull request !5 from dou33/master
This commit is contained in:
dou33 2020-11-03 15:19:00 +08:00 committed by Gitee
commit d8dd37a5d2
4 changed files with 18 additions and 23 deletions

View File

@ -1,21 +0,0 @@
diff -ur ukui-greeter-master/ukui-greeter/common/configuration.cpp ukui-greeter~/ukui-greeter/common/configuration.cpp
--- ukui-greeter-master/ukui-greeter/common/configuration.cpp 2020-07-11 17:12:01.000000000 +0800
+++ ukui-greeter~/ukui-greeter/common/configuration.cpp 2020-07-16 17:49:32.447647884 +0800
@@ -81,8 +81,7 @@
/**
- * 获å<C2B7>系统版本å<C2AC>·
- */
+ * 获å<C2B7>系统版本å<C2AC>? */
QString getSystemVersion()
{
QSettings settings("/etc/lsb-release", QSettings::IniFormat);
@@ -164,6 +163,6 @@
else if(getSystemVersion().contains("V10.1",Qt::CaseInsensitive))
return "/usr/share/backgrounds/warty-final-ubuntukylin.jpg";
else
- return "/usr/share/backgrounds/kylin/kylin-background.png";
+ return "/usr/share/backgrounds/warty-final-ubuntukylin.jpg";
}

View File

@ -0,0 +1,12 @@
diff -ur ukui-greeter-3.0.1/ukui-greeter/ukui-greeter.pro ukui-greeter-3.0.1~/ukui-greeter/ukui-greeter.pro
--- ukui-greeter-3.0.1/ukui-greeter/ukui-greeter.pro 2020-09-27 16:04:57.000000000 +0800
+++ ukui-greeter-3.0.1~/ukui-greeter/ukui-greeter.pro 2020-10-26 11:29:50.239731739 +0800
@@ -79,7 +79,7 @@
translations/tr.ts \
translations/es.ts
-system("lrelease translations/*.ts")
+system("lrelease-qt5 translations/*.ts")
qm_file.files = translations/*.qm
qm_file.path = $${PREFIX}/translations/

View File

@ -1,6 +1,6 @@
%define debug_package %{nil}
Name: ukui-greeter
Version: 1.2.5
Version: 3.0.1
Release: 1
Summary: Lightdm greeter for UKUI
License: GPL-2.0
@ -20,7 +20,7 @@ Requires: xorg-x11-xkb-utils
Provides: lightdm-greeter
patch0: fix-default-wallpaper.patch
patch0: fix-translation-issue.patch
%description
A greeter for UKUI desktop environment written by Qt5.
@ -53,7 +53,11 @@ gzip -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
%{_datadir}/xgreeters/ukui-greeter.desktop
%changelog
* Mon Oct 26 2020 douyan <douyan@kylinos.cn> - 3.0.1-1
- update 3.0.0-1+1026
* Mon Jul 20 2020 douyan <douyan@kylinos.cn> - 1.2.5-1
- update 1.2.5
* Thu Jul 9 2020 douyan <douyan@kylinos.cn> - 1.2.3-1
- Init package for openEuler