From cde7eef97895fdf9d47afe035569a75c0953e2a1 Mon Sep 17 00:00:00 2001 From: hwsmm Date: Fri, 27 May 2022 13:55:24 +0900 Subject: [PATCH] Backport bug fixes and remove systemd presets --- .../user-preset/50-opentabletdriver.preset | 1 - Redhat/opentabletdriver.spec | 25 +++++-------------- 2 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 Redhat/OpenTabletDriver/usr/lib/systemd/user-preset/50-opentabletdriver.preset diff --git a/Redhat/OpenTabletDriver/usr/lib/systemd/user-preset/50-opentabletdriver.preset b/Redhat/OpenTabletDriver/usr/lib/systemd/user-preset/50-opentabletdriver.preset deleted file mode 100644 index 5516d99..0000000 --- a/Redhat/OpenTabletDriver/usr/lib/systemd/user-preset/50-opentabletdriver.preset +++ /dev/null @@ -1 +0,0 @@ -enable opentabletdriver.service diff --git a/Redhat/opentabletdriver.spec b/Redhat/opentabletdriver.spec index 24cad48..645aec4 100755 --- a/Redhat/opentabletdriver.spec +++ b/Redhat/opentabletdriver.spec @@ -1,15 +1,14 @@ +# We don't have debug symbols, because .NET +%define debug_package %{nil} +# We aren't using Mono but RPM expected Mono +%global __requires_exclude_from ^/usr/share/OpenTabletDriver/.*$ + Name: opentabletdriver Version: 0.0.0 Release: 1 Summary: A cross-platform open source tablet driver -BuildArch: x86_64 - -%if 0%{?suse_version} -License: LGPL-3.0-only -Group: Hardware/Other -%else License: LGPLv3 -%endif +BuildArch: x86_64 URL: https://github.com/OpenTabletDriver/OpenTabletDriver @@ -36,11 +35,8 @@ rm %{buildroot}/LICENSE cp %{pkg_dir}/LICENSE %{_builddir} -%pre - %post udevadm control --reload-rules -%systemd_user_post opentabletdriver.service if lsmod | grep hid_uclogic > /dev/null ; then rmmod hid_uclogic || true @@ -50,12 +46,6 @@ if lsmod | grep wacom > /dev/null ; then rmmod wacom || true fi -%preun -%systemd_user_preun opentabletdriver.service - -%postun -%systemd_user_postun opentabletdriver.service - %files %defattr(-,root,root) %license LICENSE @@ -69,6 +59,3 @@ fi /usr/bin/opentabletdriver /usr/bin/otd /usr/lib/systemd/user/opentabletdriver.service -/usr/lib/systemd/user-preset/50-opentabletdriver.preset - -%changelog