From b402682ec6904e5b410dc2b1577e7ec40bfaa83000449aa371b177ff4ae67173 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 14 Jul 2014 14:25:18 +0000 Subject: [PATCH] Restore style and metadata fields, and add a changelog entry OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=22 --- cdemu-daemon.changes | 7 ++++++- cdemu-daemon.spec | 27 ++++++++++++++------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index 4ec6b37..0534ea4 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -1,7 +1,12 @@ ------------------------------------------------------------------- Sun Jul 13 08:48:46 UTC 2014 - sor.alexei@meowr.ru -- Update to 3.0.0 +- Update to new upstream release 3.0.0 +* The CDEmu daemon now has experimental emulation of CD-R and + DVD+R disc recording, and daemon/client protocol was extended + to allow transmission of image writer parameters descriptions + from daemon to client and parameters' values back from client + to daemon. - Remove logfile.diff patch - Add /dev/vhba_ctl read-write access udev rule diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index af840af..cf7892c 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -26,7 +26,7 @@ Url: http://cdemu.sf.net/about/daemon/ #Git-Clone: git://git.code.sf.net/p/cdemu/code Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 -Source1: %name.sysconfig +Source1: cdemu-daemon.sysconfig Source2: 60-vhba.rules BuildRequires: cmake >= 2.8.5 @@ -55,26 +55,27 @@ that can be used by clients to control it. %build cmake . \ - -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ - -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \ - -DCMAKE_C_FLAGS:STRING="%optflags" +-DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ +-DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \ +-DCMAKE_C_FLAGS:STRING="%optflags" make %{?_smp_mflags} %install +b="%buildroot" %make_install -mkdir -p "%buildroot/%_sbindir" "%buildroot/%_localstatedir/adm/fillup-templates" -install -Dm 0644 "%SOURCE1" "%buildroot/%_localstatedir/adm/fillup-templates/sysconfig.%name" -install -Dm 0644 "%SOURCE2" "%buildroot/%_prefix/lib/udev/rules.d/60-vhba.rules" -# Not desired -rm -rf "%buildroot/%_datadir/dbus-1/system-services" "%buildroot/%_sysconfdir/dbus-1/system.d/" +mkdir -p "$b/%_sbindir" "$b/%_localstatedir/adm/fillup-templates" +install -Dm 0644 "%SOURCE1" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon" +install -Dm 0644 "%SOURCE2" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules" +# 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/" %files %defattr(-,root,root) %doc AUTHORS COPYING README -%_bindir/%name -%_libexecdir/%name-session.sh -%_localstatedir/adm/fillup-templates/sysconfig.%name -%_mandir/man8/%name.8* +%_bindir/cdemu-daemon +%_libexecdir/cdemu-daemon-session.sh +%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon +%_mandir/man8/cdemu-daemon.8* %_datadir/dbus-1/ %_prefix/lib/udev/