diff --git a/0001-fix-dependency-issue.patch b/0001-fix-dependency-issue.patch deleted file mode 100644 index e06f5b9..0000000 --- a/0001-fix-dependency-issue.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur ukui-settings-daemon-3.0.1/plugins/media-keys/usd-media-keys-manager.c ukui-settings-daemon-3.0.1~/plugins/media-keys/usd-media-keys-manager.c ---- ukui-settings-daemon-3.0.1/plugins/media-keys/usd-media-keys-manager.c 2019-05-27 15:48:18.000000000 +0800 -+++ ukui-settings-daemon-3.0.1~/plugins/media-keys/usd-media-keys-manager.c 2020-10-30 14:36:42.336523345 +0800 -@@ -995,19 +994,19 @@ - static void - do_screenshot_action (UsdMediaKeysManager *manager) - { -- execute (manager, "mate-screenshot",FALSE,FALSE); -+ //execute (manager, "mate-screenshot",FALSE,FALSE); - } - - static void - do_area_screenshot_action (UsdMediaKeysManager *manager) - { -- execute (manager, "mate-screenshot -a",FALSE,FALSE); -+ //execute (manager, "mate-screenshot -a",FALSE,FALSE); - } - - static void - do_window_screenshot_action (UsdMediaKeysManager *manager) - { -- execute (manager, "mate-screenshot -w",FALSE,FALSE); -+ //execute (manager, "mate-screenshot -w",FALSE,FALSE); - } - - -@@ -1052,7 +1051,7 @@ - } else if ((cmd = g_find_program_in_path ("tracker-search-tool"))) { - execute (manager, "tracker-search-tool", FALSE, FALSE); - } else { -- execute (manager, "mate-search-tool", FALSE, FALSE); -+ //execute (manager, "mate-search-tool", FALSE, FALSE); - } - g_free (cmd); - break; diff --git a/0002-Modify-the-shortcut-key-prompt.patch b/0002-Modify-the-shortcut-key-prompt.patch deleted file mode 100644 index 87fbca1..0000000 --- a/0002-Modify-the-shortcut-key-prompt.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c3c66c32b0fd14f1b565f94cc131667578f64bff Mon Sep 17 00:00:00 2001 -From: root -Date: Thu, 16 Dec 2021 19:56:41 +0800 -Subject: [PATCH] Modify the shortcut key prompt - ---- - .../org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in | 2 +- - po/zh_CN.po | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in b/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in -index ddc2a0f..ab947c6 100755 ---- a/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in -+++ b/data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in -@@ -47,7 +47,7 @@ - - - '<Control><Alt>Delete' -- Log out -+ Open the shutdown management interfac - Binding to log out. - - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index d94aa3d..1d01c69 100755 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -468,8 +468,8 @@ msgid "Binding to shut down." - msgstr "конец связи" - - #: ../data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:19 --msgid "Log out" --msgstr "注销" -+msgid "Open the shutdown management interfac" -+msgstr "打开关机管理界面" - - #: ../data/org.ukui.SettingsDaemon.plugins.media-keys.gschema.xml.in.h:20 - msgid "Binding to log out." --- -2.30.0 - diff --git a/ukui-settings-daemon-3.0.1.tar.gz b/ukui-settings-daemon-3.0.1.tar.gz index af8c1b1..ea63fd3 100644 Binary files a/ukui-settings-daemon-3.0.1.tar.gz and b/ukui-settings-daemon-3.0.1.tar.gz differ diff --git a/ukui-settings-daemon.spec b/ukui-settings-daemon.spec index e77a4c7..e04c0d0 100644 --- a/ukui-settings-daemon.spec +++ b/ukui-settings-daemon.spec @@ -1,20 +1,75 @@ %define debug_package %{nil} Name: ukui-settings-daemon Version: 3.0.1 -Release: 2 +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 URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz -patch0: 0001-fix-dependency-issue.patch -patch1: 0002-Modify-the-shortcut-key-prompt.patch -BuildRequires: 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 libusb-devel +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:mate-desktop-devel >= 1.18 -BuildRequires:libmatekbd-devel >= 1.18 -BuildRequires:libmatemixer-devel >= 1.18 -BuildRequires:mate-common >= 1.18 + +BuildRequires: pkgconf-pkg-config +BuildRequires: qt5-qtbase +BuildRequires: qtchooser +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: qt5-qtsensors-devel +BuildRequires: kf5-kconfig-devel +BuildRequires: qt5-qtsvg-devel +BuildRequires: libxklavier-devel +BuildRequires: libXtst-devel +BuildRequires: gnome-desktop3-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: libwnck3-devel +BuildRequires: libcanberra-devel +BuildRequires: libwayland-client +BuildRequires: geoclue2-devel +BuildRequires: lcms2-devel +BuildRequires: imlib2-devel +BuildRequires: xorg-x11-server-devel +BuildRequires: libgudev-devel +BuildRequires: libxcb-devel +BuildRequires: xcb-util-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 %description @@ -55,42 +110,23 @@ Requires: intltool libcanberra-devel dbus-glib-devel dconf-devel fontconfig-deve . This package contains the architecture independent files. - -%package devel -Summary: daemon handling the UKUI session settings (development 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 -Requires: ukui-settings-daemon - -%description devel - This package contains the daemon which is responsible for setting the - various parameters of a UKUI session and the applications that run - under it. It handles the following kinds of settings: - . - * Keyboard: layout, accessibility options, shortcuts, media keys - * Clipboard management - * Theming: background, icons, GTK+ applications - * Cleanup of unused files - * Mouse: cursors, speed, accessibility options - * Startup of other daemons: screensaver, sound daemon - * Typing break - . - It also sets various application settings through X resources and - freedesktop.org XSETTINGS. - . - This package contains the development files for building - ukui-settings-daemon plugins. - %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --sysconfdir=/etc -make +qmake-qt5 +make -j24 %install -make install DESTDIR=%{buildroot} +make INSTALL_ROOT=%{buildroot} install +mkdir -p %{buildroot}/usr/share/man/man1 +mkdir -p %{buildroot}/usr/share/man/man2 + +gzip -c %{_builddir}/%{name}-%{version}/man/touchpad-state.1 > %{buildroot}/usr/share/man/man1/touchpad-state.1.gz +gzip -c %{_builddir}/%{name}-%{version}/man/ukui-settings-daemon.1 > %{buildroot}/usr/share/man/man1/ukui-settings-daemon.1.gz +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 @@ -100,29 +136,31 @@ set -e glib-compile-schemas /usr/share/glib-2.0/schemas/ %files +%doc debian/changelog debian/copyright %{_sysconfdir}/* %{_prefix}/%{_lib}/ukui-settings-daemon/ -%{_libexecdir}/ukui-settings-daemon -%{_libexecdir}/usd-datetime-mechanism -%{_libexecdir}/usd-locate-pointer -%{_libexecdir}/usd-usb-monitor %{_datadir}/dbus-1/* -%{_datadir}/polkit-1/ +/lib/udev/rules.d/01-touchpad-state-onmouse.rules +/usr/bin/authoritydbus +/usr/bin/touchpad-state +/usr/bin/ukui-settings-daemon +/usr/bin/ukydisplayswitch +/usr/bin/usd-locate-pointer + %files common %doc debian/changelog debian/copyright %{_datadir}/glib-2.0/ -%{_datadir}/icons/ %{_datadir}/locale/ -%{_datadir}/man/ %{_datadir}/ukui-settings-daemon/ +%{_datadir}/man/* -%files devel -%{_prefix}/include/ukui-settings-daemon/ -%{_prefix}/%{_lib}/pkgconfig/ %changelog +* Tue Feb 22 2022 huayadong - 3.0.1-3 +- update to upstream version 3.0.1-3 + * Thu Dec 16 2021 peijiankang - 3.0.1-2 - Modify the shortcut key prompt