update new version 3.1.2

0001-modify-compile-error-of-ukui-settings-daemon.patch

@@ -0,0 +1,24 @@
+From c7a8d75f452b33af86290c0c906c7cd00b5fcc61 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Mon, 31 Oct 2022 17:39:28 +0800
+Subject: [PATCH] modify compile error of ukui-settings-daemon
+
+---
+ translate_generation.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/translate_generation.sh b/translate_generation.sh
+index d24c183..7fcb6b7 100755
+--- a/translate_generation.sh
++++ b/translate_generation.sh
+@@ -10,6 +10,6 @@ do
+     if [ "$version" == "fedora" ] || [ "$version" == "opensuse-tumbleweed" ] || [ "$version" == "opensuse-leap" ];then
+         lrelease-qt5 "${ts}"
+     else
+-    lrelease "${ts}"
++    lrelease-qt5 "${ts}"
+     fi
+ done
+-- 
+2.36.1
+

0001-modify-compile-error.patch

@@ -1,28 +0,0 @@
-From be6fb589406d3b1777d9a07c8d2ee8e9a59e0a82 Mon Sep 17 00:00:00 2001
-From: pei-jiankang <peijiankang@kylinos.cn>
-Date: Wed, 11 May 2022 13:54:44 +0800
-Subject: [PATCH] modify compile error
-
----
- plugins/xrandr/xrandr-output.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/xrandr/xrandr-output.cpp b/plugins/xrandr/xrandr-output.cpp
-index 4162547..624db24 100644
---- a/plugins/xrandr/xrandr-output.cpp
-+++ b/plugins/xrandr/xrandr-output.cpp
-@@ -363,9 +363,9 @@ void xrandrOutput::readInOutputs(KScreen::ConfigPtr config, const QVariantList &
-         auto replicationSource = nullptr;//control.getReplicationSource(output);
-         if (replicationSource) {
-             //output->setPos(replicationSource->pos());
--            //output->setLogicalSize(replicationSource->logicalSize());
-+            //output->setExplicitLogicalSize(replicationSource->logicalSize());
-         } else {
--            output->setLogicalSize(QSizeF());
-+            output->setExplicitLogicalSize(QSizeF());
-         }
-     }
- 
--- 
-2.33.0
-

ukui-settings-daemon.spec

@@ -1,78 +1,51 @@
-%define debug_package %{nil}
 Name:           ukui-settings-daemon
-Version:        3.0.1
+Version:        3.1.2
-Release:        5
+Release:        3
 Summary:        daemon handling the UKUI session settings
-License:        GPL-2.0, GPL-2+, GPL-2.1, LGPL-2.1+, GPL-3+, LGPL-2+, MIT~OldStyleWithDisclaimer+RedHat, MIT~OldStyle+RedHat
+License:        GPL-2.0-or-later and GPL-3.0-or-later and LGPL-2.0-or-later 
 URL:            http://www.ukui.org
 Source0:        %{name}-%{version}.tar.gz
-Patch1:         0001-modify-compile-error.patch
+Patch1:         0001-modify-compile-error-of-ukui-settings-daemon.patch
-
-BuildRequires: intltool 
-BuildRequires: libcanberra-devel 
-BuildRequires: dbus-glib-devel 
-BuildRequires: dconf-devel 
-BuildRequires: fontconfig-devel 
-BuildRequires: glib2-devel 
-BuildRequires: gtk3-devel 
-BuildRequires: libnotify-devel 
-BuildRequires: nss-devel 
-BuildRequires: polkit-devel 
-BuildRequires: pulseaudio-libs-devel 
-BuildRequires: startup-notification-devel 
-BuildRequires: libX11-devel 
-BuildRequires: libXext-devel 
-BuildRequires: libXi-devel 
-BuildRequires: libxklavier-devel 
-BuildRequires: libXrandr-devel 
-BuildRequires: libXt-devel 
-BuildRequires: mate-desktop-libs 
-BuildRequires: xorg-x11-server-utils 
-BuildRequires: libusb-devel
-BuildRequires: mate-desktop-devel >= 1.18
-BuildRequires: libmatekbd-devel >= 1.18 
-BuildRequires: libmatemixer-devel >= 1.18
-BuildRequires: mate-common >= 1.18
-
-#x11proto-kb-devel
 
 BuildRequires: pkgconf-pkg-config 
-BuildRequires: qt5-qtbase
+BuildRequires: intltool 
 BuildRequires: qtchooser
 BuildRequires: qt5-qtbase-devel
 BuildRequires: qt5-qttools-devel
+BuildRequires: gsettings-qt-devel
 BuildRequires: qt5-qtx11extras-devel
 BuildRequires: qt5-qtsensors-devel 
 BuildRequires: kf5-kconfig-devel
 BuildRequires: qt5-qtsvg-devel
 BuildRequires: libxklavier-devel
 BuildRequires: libXtst-devel
+BuildRequires: mate-desktop-devel
 BuildRequires: gnome-desktop3-devel
+BuildRequires: libmatemixer-devel
+BuildRequires: libmatekbd-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: libwnck3-devel
 BuildRequires: libcanberra-devel
 BuildRequires: libwayland-client
+BuildRequires: libnotify-devel
 BuildRequires: geoclue2-devel
+BuildRequires: colord-devel
 BuildRequires: lcms2-devel
 BuildRequires: imlib2-devel 
 BuildRequires: xorg-x11-server-devel
 BuildRequires: libgudev-devel
 BuildRequires: libxcb-devel
 BuildRequires: xcb-util-devel
+BuildRequires: libX11-devel 
 BuildRequires: kf5-kwindowsystem-devel
 BuildRequires: libkscreen-qt5-devel
 BuildRequires: libxkbcommon-devel
 BuildRequires: kf5-kglobalaccel-devel
 BuildRequires: qt5-qtx11extras-devel 
-#BuildRequires: ukui-common-devel
-BuildRequires: colord
-BuildRequires: glib2
 BuildRequires: ukui-interface
-BuildRequires: colord-gtk-devel
-BuildRequires: gsettings-qt-devel
 
-Requires: mate-desktop-libs ukui-polkit ukui-settings-daemon-common imwheel xorg-x11-drv-synaptics-legacy
 
+Requires: mate-desktop-libs ukui-settings-daemon-common colord imwheel ukui-polkit xorg-x11-server-utils xorg-x11-drv-synaptics-legacy glib2-devel
 %description
  This package contains the daemon which is responsible for setting the
  various parameters of a UKUI session and the applications that run
@@ -91,7 +64,6 @@ Requires: mate-desktop-libs ukui-polkit ukui-settings-daemon-common imwheel xorg
  
 %package common
 Summary:	daemon handling the UKUI session settings (common files)
-Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-devel glib2-devel gtk3-devel libnotify-devel nss-devel polkit-devel pulseaudio-libs-devel startup-notification-devel libX11-devel libXext-devel libXi-devel libxklavier-devel libXrandr-devel libXt-devel mate-desktop-libs xorg-x11-server-utils mate-desktop-devel libmatekbd-devel libmatemixer-devel mate-common
 
 %description common
  This package contains the daemon which is responsible for setting the
@@ -116,8 +88,8 @@ Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-deve
 %patch1 -p1
 
 %build
-qmake-qt5
+%{qmake_qt5}
-make -j24
+%{make_build}
 
 %install
 make INSTALL_ROOT=%{buildroot} install
@@ -129,7 +101,6 @@ gzip -c %{_builddir}/%{name}-%{version}/man/ukui-settings-daemon.1       > %{bui
 gzip -c %{_builddir}/%{name}-%{version}/man/usd-locate-pointer.1         > %{buildroot}/usr/share/man/man1/usd-locate-pointer.1.gz
 
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -160,14 +131,29 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || :
 
 
 %changelog
-* Wed May 11 2022 peijiankang <peijiankang@kylinos.cn> - 3.0.1-5
+* Wed Jan 18 2023 peijiankang <peijiankang@kylinos.cn> - 3.1.2-3
-- modify compile error
+- add build debuginfo and debugsource
+
+* Tue Dec 6 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-2
+- modify install error
+
+* Mon Dec 5 2022 peijiankang <peijiankang@kylinos.cn> - 3.1.2-1
+- update version to 3.1.2
+
+* Mon Aug 08 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-7
+- update Copyright and Authors information
+
+* Thu Aug 04 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-6
+- remove depend xserver xorg input synaptics on s390x
+
+* Tue May 24 2022 tanyulong<tanyulong@kylinos.cn> - 3.0.1-5
+- Improve the project according to the requirements of compliance improvement
 
 * Tue Apr 19 2022 douyan <douyan@kylimos.cn> - 3.0.1-4
 - fix first install post script issue
 
-* Tue Feb  22 2022 huayadong <huayadong@kylinos.cn> - 3.0.1-3
+* Wed Apr 06 2022 tanyulong <tanyulong@kylinos.cn> - 3.0.1-3
-- update to upstream version 3.0.1-3
+- add yaml file
 
 * Thu Dec 16 2021 peijiankang <peijiankang@kylinos.cn> - 3.0.1-2
 - Modify the shortcut key prompt

ukui-settings-daemon.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo: UKUI/ukui-settings-daemon
+tag_prefix: "^v"
+separator: "."