update version to 3.1.1

0001-add-and-use-attribute-of-UseHighDpiPixmaps.patch

@@ -1,28 +0,0 @@
-From 746dea55c9b8465944430ecb8544d2c68b4fd3ab Mon Sep 17 00:00:00 2001
-From: tanyulong2021 <tanyulong@kylinos.cn>
-Date: Thu, 4 Aug 2022 11:51:36 +0800
-Subject: [PATCH] add and use attribute of UseHighDpiPixmaps
-
----
- src/ukui-screensaver-dialog.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/ukui-screensaver-dialog.cpp b/src/ukui-screensaver-dialog.cpp
-index cd69513..ad49e1b 100644
---- a/src/ukui-screensaver-dialog.cpp
-+++ b/src/ukui-screensaver-dialog.cpp
-@@ -116,6 +116,11 @@ int main(int argc, char *argv[])
- {
-     checkIsRunning();
-     checkIslivecd();
-+    #if(QT_VERSION >= QT_VERSION_CHECK(5,6,0))
-+       QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-+       QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
-+    #endif
-+
-     QApplication a(argc, argv);
-     QApplication::setSetuidAllowed(true);
- 
--- 
-2.33.0
-

0002-modify-username-size.patch

@@ -1,25 +0,0 @@
-From d1247bc1d54ad5190a3c977280df84b7e9099012 Mon Sep 17 00:00:00 2001
-From: tanyulong2021 <tanyulong@kylinos.cn>
-Date: Mon, 8 Aug 2022 11:05:51 +0800
-Subject: [PATCH] increase username size
-
----
- src/assets/authdialog.qss | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/assets/authdialog.qss b/src/assets/authdialog.qss
-index c01b035..b8a72ae 100644
---- a/src/assets/authdialog.qss
-+++ b/src/assets/authdialog.qss
-@@ -22,7 +22,7 @@ QLabel {
- 
- /* 用户名 */
- #login_nameLabel{
--    font-size: 30px;
-+    font-size: 24px;
- }
- 
- /* 密码输入框 */
--- 
-2.33.0
-

ukui-screensaver.spec

@@ -1,48 +1,44 @@
 Name:           ukui-screensaver
-Version:        3.0.1
+Version:        3.1.1
-Release:        22
+Release:        1
-Summary:        parallels toolbox for UKUI
+Summary:        Screensaver for UKUI desktop environment
-License:        GPL-2.0-or-later and GPL-3.0-or-later
+License:        GPL-3+ and GPL-2+
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
 
-BuildRequires: glib2-devel
+BuildRequires:  cmake
-BuildRequires: qt5-qtbase-devel
+BuildRequires:  qt5-qtbase-devel
-BuildRequires: qt5-qtsvg-devel
+BuildRequires:  qt5-qtx11extras-devel
-BuildRequires: qt5-qtmultimedia-devel
+BuildRequires:  pam-devel
-BuildRequires: qt5-qttools-devel
+BuildRequires:  qt5-qttools-devel
-BuildRequires: gsettings-qt-devel
+BuildRequires:  glib2-devel
-BuildRequires: dconf-devel
+BuildRequires:  opencv
-BuildRequires: libXtst-devel
+BuildRequires:  libX11-devel
-BuildRequires: cmake
+BuildRequires:  libXtst-devel
-BuildRequires: qt5-qtx11extras-devel
+BuildRequires:  qt5-qtsvg-devel
-BuildRequires: pam-devel
+BuildRequires:  gsettings-qt-devel
+BuildRequires:  kf5-kwindowsystem-devel
+BuildRequires:  libmatemixer-devel
+BuildRequires:  ukui-interface
 
-Requires: glib2-devel
-Requires: qt5-qtbase-devel
-Requires: qt5-qtsvg-devel
-Requires: qt5-qtmultimedia-devel
-Requires: qt5-qttools-devel
-Requires: gsettings-qt-devel
-Requires: dconf-devel
 
-patch0 :  0001-add-and-use-attribute-of-UseHighDpiPixmaps.patch
+Requires:       ukui-session-manager
-patch1:	  0002-modify-username-size.patch
+Requires:       glib2-devel
+Requires:       ethtool
+Requires:       mate-common
+
 
 %description
- The ukui-sidebar is mainly used in the desktop operating system.
+A simple and lightweight screensaver written by Qt5.        
- It pops up from the right side of the desktop in the form of a tray,
+The screensaver supports biometric auhentication which is   
- displaying some application notification messages and some cutting
+provided by biometric-auth service.                         
- storage information.
                                                             
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 cmake .
-make
+make -j4
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,22 +47,31 @@ make install DESTDIR=%{buildroot}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+set -e
+glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null ||:
+
+
 %files
 %doc debian/copyright debian/changelog
 %{_bindir}/ukui-screensaver-dialog
 %{_bindir}/ukui-screensaver-backend
 %{_bindir}/ukui-screensaver-command
+%{_bindir}/screensaver-startup.sh
+%{_bindir}/ukui-screensaver-checkpass
 %{_datadir}/ukui-screensaver/*
 %{_datadir}/glib-2.0/schemas/org.ukui.screensaver.gschema.xml
 %{_sysconfdir}/xdg/autostart/ukui-screensaver.desktop
 %{_datadir}/desktop-directories/ukui-screensaver.directory
 %{_sysconfdir}/xdg/menus/ukui-screensavers.menu
 %{_sysconfdir}/pam.d/ukui-screensaver-qt
-##%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default
+%{_prefix}/lib/ukui-screensaver/ukui-screensaver-default
-#%%{_datadir}/ukui-screensaver/screensaver.ini
+%{_prefix}/lib/ukui-screensaver/screensaver-focus-helper
-#%%{_datadir}/ukui-screensaver/screensaver-en.ini
 
 %changelog
+* Tue Dec 6 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.1-1
+- update version to 3.1.1
+
 * Mon Aug 08 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-22
 - modify username size