diff --git a/0002-fix-build-compile-error.patch b/0002-fix-build-compile-error.patch new file mode 100644 index 0000000..896f626 --- /dev/null +++ b/0002-fix-build-compile-error.patch @@ -0,0 +1,24 @@ +From 6f41615756a3793420918265fba01148eab4b42b Mon Sep 17 00:00:00 2001 +From: tanyulong2021 +Date: Fri, 10 Feb 2023 09:56:04 +0800 +Subject: [PATCH] fix build compile error + +--- + BiometricAuth/giodbus.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/BiometricAuth/giodbus.cpp b/BiometricAuth/giodbus.cpp +index 9e0490e..4ad8d27 100644 +--- a/BiometricAuth/giodbus.cpp ++++ b/BiometricAuth/giodbus.cpp +@@ -1,6 +1,6 @@ + #include "giodbus.h" + #include +-#include ++#include + #include + + int get_server_gvariant_stdout (int drvid) +-- +2.33.0 + diff --git a/ukui-screensaver-3.0.3.tar.gz b/ukui-screensaver-3.0.3.tar.gz deleted file mode 100644 index 933f582..0000000 Binary files a/ukui-screensaver-3.0.3.tar.gz and /dev/null differ diff --git a/ukui-screensaver-3.1.1.tar.gz b/ukui-screensaver-3.1.1.tar.gz new file mode 100644 index 0000000..a8da2a1 Binary files /dev/null and b/ukui-screensaver-3.1.1.tar.gz differ diff --git a/ukui-screensaver.spec b/ukui-screensaver.spec index 25f57d8..e0e1090 100644 --- a/ukui-screensaver.spec +++ b/ukui-screensaver.spec @@ -1,47 +1,56 @@ +#glib2-devel >= 2.74.4 glib2test 1 +%global glib2test 0 + Name: ukui-screensaver -Version: 3.0.3 -Release: 2 -Summary: parallels toolbox for UKUI -License: GPL-3+ GPL-2+ +Version: 3.1.1 +Release: 3 +Summary: Screensaver for UKUI desktop environment +License: GPL-3+ and GPL-2+ URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz Patch01: 0001-fix-root-can-not-input-passwd-bug.patch -BuildRequires: glib2-devel -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qtmultimedia-devel -BuildRequires: qt5-qttools-devel -BuildRequires: gsettings-qt-devel -BuildRequires: dconf-devel -BuildRequires: libXtst-devel +#glib2-devel >= 2.74.4 apply pathch02 +%if %{?glib2test} +Patch02: 0002-fix-build-compile-error.patch +%endif + BuildRequires: cmake +BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel BuildRequires: pam-devel +BuildRequires: qt5-qttools-devel +BuildRequires: glib2-devel BuildRequires: opencv +BuildRequires: libX11-devel +BuildRequires: libXtst-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: gsettings-qt-devel BuildRequires: kf5-kwindowsystem-devel BuildRequires: libmatemixer-devel +BuildRequires: ukui-interface + +Requires: ukui-session-manager 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 +Requires: ethtool +Requires: mate-common + %description - The ukui-sidebar is mainly used in the desktop operating system. - It pops up from the right side of the desktop in the form of a tray, - displaying some application notification messages and some cutting - storage information. - +A simple and lightweight screensaver written by Qt5. +The screensaver supports biometric auhentication which is +provided by biometric-auth service. + %prep %setup -q %patch1 -p1 +%if %{?glib2test} +%patch2 -p1 +%endif %build cmake . -make +make -j4 %install rm -rf $RPM_BUILD_ROOT @@ -50,6 +59,11 @@ 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 @@ -65,15 +79,31 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/pam.d/ukui-screensaver-qt %{_prefix}/lib/ukui-screensaver/ukui-screensaver-default %{_prefix}/lib/ukui-screensaver/screensaver-focus-helper -#%%{_datadir}/ukui-screensaver/screensaver.ini -#%%{_datadir}/ukui-screensaver/screensaver-en.ini %changelog -* Wed Mar 2 2022 pei-jiankang - 3.0.3-2 +* Fri Feb 10 2023 tanyulong - 3.1.1-3 +- fix build compile error + +* Fri Dec 9 2022 peijiankang - 3.1.1-2 - fix root can not input passwd bug -* Wed Feb 23 2022 douyan - 3.0.3-1 -- update to upstream version 3.0.3-1 +* Tue Dec 6 2022 peijiankang - 3.1.1-1 +- update version to 3.1.1 + +* Mon Aug 08 2022 tanyulong - 3.0.1-22 +- modify username size + +* Thu Aug 04 2022 tanyulong - 3.0.1-21 +- add and use attribute of UseHighDpiPixmaps + +* Fri May 20 2022 tanyulong - 3.0.1-20 +- Improve the project according to the requirements of compliance improvement + +* Sat Apr 02 2022 tanyulong - 3.0.1-19 +- add yaml file + +* Mon Mar 28 2022 huayadong - 3.0.1-18 +- Before adding the lock screen, determine whether the lock screen has been activated, and prevent the login password box from being input when multiple lock screens are activated. * Fri Dec 10 2021 huayadong - 3.0.1-17 - add patch15: 0001-insert-the-monitor-after-placement-and-the-screensav.patch diff --git a/ukui-screensaver.yaml b/ukui-screensaver.yaml new file mode 100644 index 0000000..0124927 --- /dev/null +++ b/ukui-screensaver.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: UKUI/ukui-screensaver +tag_prefix: "^v" +separator: "."