diff --git a/cdemu-daemon-3.2.4.tar.bz2 b/cdemu-daemon-3.2.4.tar.bz2 deleted file mode 100644 index a628ce9..0000000 --- a/cdemu-daemon-3.2.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a6b32d4b78631e5f449f05f8d26b7f2f46dd3e82387f5855ccabb4933592de0b -size 83580 diff --git a/cdemu-daemon-3.2.5.tar.xz b/cdemu-daemon-3.2.5.tar.xz new file mode 100644 index 0000000..e560cc4 --- /dev/null +++ b/cdemu-daemon-3.2.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d1053b195e8f9040c5628340740aa9bbfdd4891bac06fbc5eb5cd4ec376e699 +size 85948 diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index 4fdda14..6651b6f 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 20 09:59:59 UTC 2021 - Jan Engelhardt + +- Update to release 3.2.5 + * Updated ISRC validation to match crdao documentation. + * Remove bundled DBus activation scripts. +- Remove logfile.diff (no longer applicable) + ------------------------------------------------------------------- Fri May 1 13:57:00 UTC 2020 - Aaron Stern diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index 46e33b3..bd6b4cd 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -1,7 +1,7 @@ # # spec file for package cdemu-daemon # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,18 +22,17 @@ %endif Name: cdemu-daemon -Version: 3.2.4 +Version: 3.2.5 Release: 0 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: git://git.code.sf.net/p/cdemu/code -Source: https://downloads.sf.net/cdemu/%name-%version.tar.bz2 +#Git-Clone: https://github.com/cdemu/cdemu +Source: https://downloads.sf.net/cdemu/%name-%version.tar.xz Source2: 60-vhba.rules Source3: cdemu-daemon.sysconfig -Patch1: logfile.diff BuildRequires: cmake >= 2.8.5 BuildRequires: intltool >= 0.21 BuildRequires: pkg-config >= 0.16 @@ -62,12 +61,11 @@ The daemon registers itself on D-BUS's system or session bus that can be used by clients to control it. %prep -%setup -q -%patch -P 1 -p1 +%autosetup -p1 %build %cmake -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" -make %{?_smp_mflags} +%cmake_build %install b="%buildroot" @@ -77,18 +75,15 @@ mkdir -p "$b/%_sbindir" "$b/%_fillupdir" \ install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules" install -pm0644 "%{S:3}" "$b/%_fillupdir/sysconfig.cdemu-daemon" # Not desired for security; it would permit a user to start a system service. -rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/" +#rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/" %find_lang %name %post %fillup_only %files -f %name.lang -%defattr(-,root,root) %doc AUTHORS COPYING README %_bindir/cdemu-daemon -%_libexecdir/cdemu-daemon-session.sh -%_datadir/dbus-1/ %_mandir/man8/cdemu-daemon.8* %_fillupdir/sysconfig.cdemu-daemon %_prefix/lib/udev/ diff --git a/logfile.diff b/logfile.diff deleted file mode 100644 index afab5d6..0000000 --- a/logfile.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- - system/cdemu-daemon-system.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh -=================================================================== ---- cdemu-daemon-2.1.0.orig/system/cdemu-daemon-system.sh -+++ cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh -@@ -6,7 +6,7 @@ - # Default settings - NUM_DEVICES=1 - AUDIO_DRIVER=null --LOG_FILE=/tmp/cdemu-daemon.log -+LOG_FILE=/var/log/cdemu-daemon.log - - # Read the settings - CONFIG_FILE=/etc/sysconfig/cdemu-daemon