jengelh/cdemu-daemon
SHA256
1
0
Fork 0
forked from pool/cdemu-daemon
Code Pull Requests Activity

cdemu-daemon-3.0.3

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=38
This commit is contained in:
Jan Engelhardt 2015-11-23 22:31:58 +00:00 committed by Git OBS Bridge
parent dc1f847150
commit d42c419009
5 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cdemu-daemon-3.0.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c9a0d292e0fd71538f123f2b795f4490ff455f68b391b97812be369c34a4f06
size 76029

3
cdemu-daemon-3.0.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75dc8da3e7c5dfb2f9d5257590c1e3eeb446750ef0ceeeb0b729003a401ff101
size 76093

10
cdemu-daemon.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Nov 23 22:21:26 UTC 2015 - jengelh@inai.de
- Update to new upstream release 3.0.3
* fixed a copy-and-paste error in feature initialization code
* daemon: device: signal the Media Eject Request event only when
device unload is requested via D-Bus API
- Run %fillup and populate /etc/sysconfig/cdemu-daemon
- Drop cdemu_daemon_typo_in_mmc_packet_commands_h.patch (merged)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 26 12:44:38 UTC 2015 - normand@linux.vnet.ibm.com Thu Feb 26 12:44:38 UTC 2015 - normand@linux.vnet.ibm.com

16
cdemu-daemon.spec
View File

@ -17,7 +17,7 @@
Name: cdemu-daemon Name: cdemu-daemon
Version: 3.0.2 Version: 3.0.3
Release: 0 Release: 0
Summary: Device daemon for cdemu, a virtual CD-ROM device emulator Summary: Device daemon for cdemu, a virtual CD-ROM device emulator
License: GPL-2.0+ License: GPL-2.0+
@ -29,7 +29,6 @@ Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2
Source2: 60-vhba.rules Source2: 60-vhba.rules
Source3: cdemu-daemon.sysconfig Source3: cdemu-daemon.sysconfig
Patch1: logfile.diff Patch1: logfile.diff
Patch2: cdemu_daemon_typo_in_mmc_packet_commands_h.patch
BuildRequires: cmake >= 2.8.5 BuildRequires: cmake >= 2.8.5
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(ao) >= 0.8.0 BuildRequires: pkgconfig(ao) >= 0.8.0
@ -39,6 +38,7 @@ BuildRequires: pkgconfig(gmodule-2.0) >= 2.28
BuildRequires: pkgconfig(gobject-2.0) >= 2.28 BuildRequires: pkgconfig(gobject-2.0) >= 2.28
BuildRequires: pkgconfig(gthread-2.0) >= 2.28 BuildRequires: pkgconfig(gthread-2.0) >= 2.28
BuildRequires: pkgconfig(libmirage) >= %version BuildRequires: pkgconfig(libmirage) >= %version
Requires(pre): %fillup_prereq
%description %description
cdemu-daemon receives SCSI commands from kernel module thorugh the cdemu-daemon receives SCSI commands from kernel module thorugh the
@ -53,18 +53,15 @@ that can be used by clients to control it.
%prep %prep
%setup -q %setup -q
%patch -P 1 -P 2 -p1 %patch -P 1 -p1
%build %build
cmake . \ %cmake -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir"
-DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \
-DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \
-DCMAKE_C_FLAGS:STRING="%optflags"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
b="%buildroot" b="%buildroot"
%make_install %cmake_install
mkdir -p "$b/%_sbindir" "$b/%_localstatedir/adm/fillup-templates" \ mkdir -p "$b/%_sbindir" "$b/%_localstatedir/adm/fillup-templates" \
"$b/%_prefix/lib/udev/rules.d" "$b/%_prefix/lib/udev/rules.d"
install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules" install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules"
@ -72,6 +69,9 @@ install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdem
# Not desired for security; it would permit a user to start a system service. # 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/"
%post
%fillup_only
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING README %doc AUTHORS COPYING README

34
cdemu_daemon_typo_in_mmc_packet_commands_h.patch
View File

@ -1,34 +0,0 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: cdemu daemon typo in mmc packet commands h
Date: Thu, 26 Feb 2015 13:21:14 +0100
References: https://sourceforge.net/p/cdemu/patches/22/
cdemu daemon typo in mmc packet commands h
that make build failure for ppc/ppc64 archi:
===
Building C object CMakeFiles/cdemu-daemon.dir/src/device.c.o
In file included from /home/abuild/rpmbuild/BUILD/cdemu-daemon-3.0.2/src/cdemu.h:51:0,
from /home/abuild/rpmbuild/BUILD/cdemu-daemon-3.0.2/src/daemon.c:20:
/home/abuild/rpmbuild/BUILD/cdemu-daemon-3.0.2/src/mmc-packet-commands.h:1671:9: error: expected ',', ';' or '}' before 'guint8'
guint8 itwp : 3;
^
===
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
src/mmc-packet-commands.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: cdemu-daemon-3.0.2/src/mmc-packet-commands.h
===================================================================
--- cdemu-daemon-3.0.2.orig/src/mmc-packet-commands.h
+++ cdemu-daemon-3.0.2/src/mmc-packet-commands.h
@@ -1667,7 +1667,7 @@ struct READ_TOC_PMA_ATIP_4_Header
struct READ_TOC_PMA_ATIP_4_Descriptor
{
#if G_BYTE_ORDER == G_BIG_ENDIAN
- guint8 one1 : 1
+ guint8 one1 : 1;
guint8 itwp : 3;
guint8 reserved1 : 1;
guint8 ref_speed : 3;