From dfbc0be81b01f852acf784cf916d60a29c07b8be722856f57a86f63fb606f959 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 8 Mar 2024 19:00:24 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=71 --- 60-vhba.rules | 2 +- cdemu-daemon.changes | 7 ------- cdemu-daemon.spec | 17 ++++++++++------- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/60-vhba.rules b/60-vhba.rules index 987d7a9..4e8fbff 100644 --- a/60-vhba.rules +++ b/60-vhba.rules @@ -1,2 +1,2 @@ #KERNEL=="vhba_ctl", NAME="%k", MODE="0660", OWNER="root", GROUP="cdrom" -KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=vhba_ctl" +KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess" diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index 07e6e1a..43629b6 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Tue Feb 27 09:48:05 UTC 2024 - Matthias Bach - -- Fix cdemu-daemon startup failing for regular users due to not - being able to trigger the load of the vhba kernel module. - (boo#958517) - ------------------------------------------------------------------- Sat Feb 5 12:47:15 UTC 2022 - Jan Engelhardt diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index cc8db73..96448f6 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -18,8 +18,9 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir %{_localstatedir}/adm/fillup-templates + %define _fillupdir /var/adm/fillup-templates %endif + Name: cdemu-daemon Version: 3.2.6 Release: 0 @@ -27,6 +28,7 @@ Summary: Device daemon for cdemu, a virtual CD-ROM device emulator License: GPL-2.0-or-later Group: System/Daemons URL: https://cdemu.sourceforge.io/about/daemon/ + #Git-Clone: https://github.com/cdemu/cdemu Source: https://downloads.sf.net/cdemu/%name-%version.tar.xz Source2: 60-vhba.rules @@ -34,7 +36,7 @@ Source3: cdemu-daemon.sysconfig Source4: cdemu-daemon.service BuildRequires: cmake >= 2.8.5 BuildRequires: intltool >= 0.21 -BuildRequires: pkgconfig >= 0.16 +BuildRequires: pkg-config >= 0.16 BuildRequires: pkgconfig(ao) >= 0.8.0 BuildRequires: pkgconfig(gio-2.0) >= 2.30 BuildRequires: pkgconfig(glib-2.0) >= 2.30 @@ -42,9 +44,10 @@ BuildRequires: pkgconfig(gmodule-2.0) >= 2.30 BuildRequires: pkgconfig(gobject-2.0) >= 2.30 BuildRequires: pkgconfig(gthread-2.0) >= 2.30 BuildRequires: pkgconfig(libmirage) >= 3.2.0 -Requires: vhba-kmp Requires(pre): %fillup_prereq +Requires: vhba-kmp Recommends: %name-lang + %lang_package %description @@ -66,14 +69,14 @@ that can be used by clients to control it. %cmake_build %install -b=%{buildroot} +b="%buildroot" %cmake_install mkdir -p "$b/%_sbindir" "$b/%_fillupdir" \ "$b/%_prefix/lib/udev/rules.d" -install -pm0644 "%{SOURCE2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules" -install -pm0644 "%{SOURCE3}" "$b/%_fillupdir/sysconfig.cdemu-daemon" +install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules" +install -pm0644 "%{S:3}" "$b/%_fillupdir/sysconfig.cdemu-daemon" mkdir -p "$b/%_userunitdir" -install -pm0644 "%{SOURCE4}" "$b/%_userunitdir/cdemu-daemon.service" +install -pm0644 "%{S:4}" "$b/%_userunitdir/cdemu-daemon.service" mkdir -p "$b/%_datadir/dbus-1/services" install -pm0644 "service-example/net.sf.cdemu.CDEmuDaemon.service" "$b/%_datadir/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service" %find_lang %name From 1b48fe6b60f53f2943a11ee6640eb05a2721cc2f3c98e8a9e4afc4e633646531 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 11 Mar 2024 12:21:56 +0000 Subject: [PATCH 2/2] - Revert Feb 27 addition of static_node; this does not do anything. OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=72 --- cdemu-daemon.changes | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index 43629b6..f577c56 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Mar 11 12:17:01 UTC 2024 - Jan Engelhardt + +- Revert Feb 27 addition of static_node; this does not do anything. + +------------------------------------------------------------------- +Tue Feb 27 09:48:05 UTC 2024 - Matthias Bach + +- Fix cdemu-daemon startup failing for regular users due to not + being able to trigger the load of the vhba kernel module. + (boo#958517) + ------------------------------------------------------------------- Sat Feb 5 12:47:15 UTC 2022 - Jan Engelhardt