From 3ceac3191cf848c9d0892a16cd4d68c1f2951284ac13ec1a91aed025c33b4642 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 23 Nov 2015 22:31:58 +0000 Subject: [PATCH] cdemu-daemon-3.0.3 OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=38 --- cdemu-daemon-3.0.2.tar.bz2 | 3 -- cdemu-daemon-3.0.3.tar.bz2 | 3 ++ cdemu-daemon.changes | 10 ++++++ cdemu-daemon.spec | 16 ++++----- ...daemon_typo_in_mmc_packet_commands_h.patch | 34 ------------------- 5 files changed, 21 insertions(+), 45 deletions(-) delete mode 100644 cdemu-daemon-3.0.2.tar.bz2 create mode 100644 cdemu-daemon-3.0.3.tar.bz2 delete mode 100644 cdemu_daemon_typo_in_mmc_packet_commands_h.patch diff --git a/cdemu-daemon-3.0.2.tar.bz2 b/cdemu-daemon-3.0.2.tar.bz2 deleted file mode 100644 index 8eb8242..0000000 --- a/cdemu-daemon-3.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c9a0d292e0fd71538f123f2b795f4490ff455f68b391b97812be369c34a4f06 -size 76029 diff --git a/cdemu-daemon-3.0.3.tar.bz2 b/cdemu-daemon-3.0.3.tar.bz2 new file mode 100644 index 0000000..b7fca50 --- /dev/null +++ b/cdemu-daemon-3.0.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75dc8da3e7c5dfb2f9d5257590c1e3eeb446750ef0ceeeb0b729003a401ff101 +size 76093 diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index 8fe0fb9..a5ccad1 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -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 diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index 1a4bb85..21a4291 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -17,7 +17,7 @@ Name: cdemu-daemon -Version: 3.0.2 +Version: 3.0.3 Release: 0 Summary: Device daemon for cdemu, a virtual CD-ROM device emulator License: GPL-2.0+ @@ -29,7 +29,6 @@ Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 Source2: 60-vhba.rules Source3: cdemu-daemon.sysconfig Patch1: logfile.diff -Patch2: cdemu_daemon_typo_in_mmc_packet_commands_h.patch BuildRequires: cmake >= 2.8.5 BuildRequires: pkgconfig 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(gthread-2.0) >= 2.28 BuildRequires: pkgconfig(libmirage) >= %version +Requires(pre): %fillup_prereq %description cdemu-daemon receives SCSI commands from kernel module thorugh the @@ -53,18 +53,15 @@ that can be used by clients to control it. %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 %build -cmake . \ - -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ - -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \ - -DCMAKE_C_FLAGS:STRING="%optflags" +%cmake -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" make %{?_smp_mflags} %install b="%buildroot" -%make_install +%cmake_install mkdir -p "$b/%_sbindir" "$b/%_localstatedir/adm/fillup-templates" \ "$b/%_prefix/lib/udev/rules.d" 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. rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/" +%post +%fillup_only + %files %defattr(-,root,root) %doc AUTHORS COPYING README diff --git a/cdemu_daemon_typo_in_mmc_packet_commands_h.patch b/cdemu_daemon_typo_in_mmc_packet_commands_h.patch deleted file mode 100644 index d81bad2..0000000 --- a/cdemu_daemon_typo_in_mmc_packet_commands_h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Michel Normand -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 ---- - 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;