!30 remove depend xserver xorg input synaptics on s390x

From: @tanyulong2021 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
This commit is contained in:
openeuler-ci-bot 2022-08-05 03:34:35 +00:00 committed by Gitee
commit 314dfe22d3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 1820a7ccc55b03c3629b446eb19f55e75962982c Mon Sep 17 00:00:00 2001
From: tanyulong2021 <tanyulong@kylinos.cn>
Date: Thu, 4 Aug 2022 11:37:51 +0800
Subject: [PATCH] don't depend xserver-xorg-input-synaptics on s390x
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index c98dea1..85ea207 100755
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Depends: mate-desktop-common,
imwheel,
ukui-settings-daemon-common (= ${source:Version}),
x11-xserver-utils,
- xserver-xorg-input-synaptics,
+ xserver-xorg-input-synaptics [!s390x],
${misc:Depends},
${shlibs:Depends},
Description: daemon handling the UKUI session settings
--
2.33.0

View File

@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: ukui-settings-daemon
Version: 3.0.1
Release: 5
Release: 6
Summary: daemon handling the UKUI session settings
License: GPL-2.0-or-later and GPL-3.0-or-later and LGPL-2.0-or-later
URL: http://www.ukui.org
@ -9,6 +9,8 @@ Source0: %{name}-%{version}.tar.gz
patch0: 0001-fix-dependency-issue.patch
patch1: 0002-Modify-the-shortcut-key-prompt.patch
patch2: 0003-remove-depend-xserver-xorg-input-synaptics-on-s390x.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
#x11proto-kb-devel
BuildRequires:mate-desktop-devel >= 1.18
@ -84,6 +86,7 @@ Requires: ukui-settings-daemon
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 --sysconfdir=/etc
@ -123,6 +126,9 @@ glib-compile-schemas /usr/share/glib-2.0/schemas/ &> /dev/null || :
%changelog
* 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