Accepting request 1156922 from filesystems

- Revert Feb 27 addition of static_node; this does not do anything.

OBS-URL: https://build.opensuse.org/request/show/1156922
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cdemu-daemon?expand=0&rev=29
This commit is contained in:
Ana Guerrero 2024-03-11 14:35:07 +00:00 committed by Git OBS Bridge
commit fd1d956ca8
3 changed files with 16 additions and 8 deletions

View File

@ -1,2 +1,2 @@
#KERNEL=="vhba_ctl", NAME="%k", MODE="0660", OWNER="root", GROUP="cdrom" #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"

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 11 12:17:01 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Revert Feb 27 addition of static_node; this does not do anything.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 27 09:48:05 UTC 2024 - Matthias Bach <marix@marix.org> Tue Feb 27 09:48:05 UTC 2024 - Matthias Bach <marix@marix.org>

View File

@ -18,8 +18,9 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017 #Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates %define _fillupdir /var/adm/fillup-templates
%endif %endif
Name: cdemu-daemon Name: cdemu-daemon
Version: 3.2.6 Version: 3.2.6
Release: 0 Release: 0
@ -27,6 +28,7 @@ Summary: Device daemon for cdemu, a virtual CD-ROM device emulator
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Daemons Group: System/Daemons
URL: https://cdemu.sourceforge.io/about/daemon/ URL: https://cdemu.sourceforge.io/about/daemon/
#Git-Clone: https://github.com/cdemu/cdemu #Git-Clone: https://github.com/cdemu/cdemu
Source: https://downloads.sf.net/cdemu/%name-%version.tar.xz Source: https://downloads.sf.net/cdemu/%name-%version.tar.xz
Source2: 60-vhba.rules Source2: 60-vhba.rules
@ -34,7 +36,7 @@ Source3: cdemu-daemon.sysconfig
Source4: cdemu-daemon.service Source4: cdemu-daemon.service
BuildRequires: cmake >= 2.8.5 BuildRequires: cmake >= 2.8.5
BuildRequires: intltool >= 0.21 BuildRequires: intltool >= 0.21
BuildRequires: pkgconfig >= 0.16 BuildRequires: pkg-config >= 0.16
BuildRequires: pkgconfig(ao) >= 0.8.0 BuildRequires: pkgconfig(ao) >= 0.8.0
BuildRequires: pkgconfig(gio-2.0) >= 2.30 BuildRequires: pkgconfig(gio-2.0) >= 2.30
BuildRequires: pkgconfig(glib-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(gobject-2.0) >= 2.30
BuildRequires: pkgconfig(gthread-2.0) >= 2.30 BuildRequires: pkgconfig(gthread-2.0) >= 2.30
BuildRequires: pkgconfig(libmirage) >= 3.2.0 BuildRequires: pkgconfig(libmirage) >= 3.2.0
Requires: vhba-kmp
Requires(pre): %fillup_prereq Requires(pre): %fillup_prereq
Requires: vhba-kmp
Recommends: %name-lang Recommends: %name-lang
%lang_package %lang_package
%description %description
@ -66,14 +69,14 @@ that can be used by clients to control it.
%cmake_build %cmake_build
%install %install
b=%{buildroot} b="%buildroot"
%cmake_install %cmake_install
mkdir -p "$b/%_sbindir" "$b/%_fillupdir" \ mkdir -p "$b/%_sbindir" "$b/%_fillupdir" \
"$b/%_prefix/lib/udev/rules.d" "$b/%_prefix/lib/udev/rules.d"
install -pm0644 "%{SOURCE2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules" install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules"
install -pm0644 "%{SOURCE3}" "$b/%_fillupdir/sysconfig.cdemu-daemon" install -pm0644 "%{S:3}" "$b/%_fillupdir/sysconfig.cdemu-daemon"
mkdir -p "$b/%_userunitdir" 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" 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" install -pm0644 "service-example/net.sf.cdemu.CDEmuDaemon.service" "$b/%_datadir/dbus-1/services/net.sf.cdemu.CDEmuDaemon.service"
%find_lang %name %find_lang %name