From a9faa0f711a0a57d4d943c7512d8be0b8da0b870806d0561964f38885b4954da Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 9 Jun 2013 14:38:45 +0000
Subject: [PATCH] cdemu-daemon-2.1.0

OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=17
---
 cdemu-daemon-2.0.0.tar.xz  |  3 ---
 cdemu-daemon-2.1.0.tar.bz2 |  3 +++
 cdemu-daemon.changes       | 17 +++++++++++++++++
 cdemu-daemon.spec          |  9 ++++-----
 logfile.diff               |  8 ++++----
 5 files changed, 28 insertions(+), 12 deletions(-)
 delete mode 100644 cdemu-daemon-2.0.0.tar.xz
 create mode 100644 cdemu-daemon-2.1.0.tar.bz2

diff --git a/cdemu-daemon-2.0.0.tar.xz b/cdemu-daemon-2.0.0.tar.xz
deleted file mode 100644
index 7ce8320..0000000
--- a/cdemu-daemon-2.0.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:71ebabddfb12bfe3eaeeb2321457d8f78a667b341094054432ee70c484e6f5a3
-size 62444
diff --git a/cdemu-daemon-2.1.0.tar.bz2 b/cdemu-daemon-2.1.0.tar.bz2
new file mode 100644
index 0000000..133804f
--- /dev/null
+++ b/cdemu-daemon-2.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8224a5d8d16cbd9a2294e9c7ab544d61059d9870023e48705699af7366846580
+size 62540
diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes
index d654980..fd8e914 100644
--- a/cdemu-daemon.changes
+++ b/cdemu-daemon.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sun Jun  9 14:37:29 UTC 2013 - jengelh@inai.de
+
+- Update to new upstream release 2.1.0
+* Use non-blocking I/O on VHBA control device, implemented device
+  restart on kernel/userspace I/O errors
+* Added support for device addition/removal. To preserve device
+  numbering, devices can only be appended, and only the last device
+  can be removed.
+* Auto-started daemon now creates only a single device by default.
+* Fixed device ID reported by INQUIRY, where last letters were
+  missing
+* Session autostart script now uses "default" instead of "pulse"
+  for audio driver.
+* If audio device initialization fails, fallback to "null" instead
+  of just stopping the playback thread.
+
 -------------------------------------------------------------------
 Sat Apr 13 21:03:26 UTC 2013 - jengelh@inai.de
 
diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec
index dd3fecc..9fc14bc 100644
--- a/cdemu-daemon.spec
+++ b/cdemu-daemon.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cdemu-daemon
-Version:        2.0.0
+Version:        2.1.0
 Release:        0
 Summary:        Device daemon for cdemu, a virtual CD-ROM device emulator
 License:        GPL-2.0+
@@ -27,20 +27,19 @@ Url:            http://cdemu.sf.net/
 #Freecode-URL:	https://freecode.com/projects/cdemu-for-linux
 #Git-Clone:	git://git.code.sf.net/p/cdemu/code
 #DL-URL:	http://downloads.sf.net/cdemu/%name-%version.tar.bz2
-Source:         %name-%version.tar.xz
+Source:         http://downloads.sf.net/cdemu/%name-%version.tar.bz2
 Source3:        cdemu-daemon.sysconfig
 Patch1:         logfile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake >= 2.8.5
 BuildRequires:  pkgconfig
-BuildRequires:  xz
 BuildRequires:  pkgconfig(ao) >= 0.8.0
 BuildRequires:  pkgconfig(gio-2.0) >= 2.28
 BuildRequires:  pkgconfig(glib-2.0) >= 2.28
 BuildRequires:  pkgconfig(gmodule-2.0) >= 2.28
 BuildRequires:  pkgconfig(gobject-2.0) >= 2.28
 BuildRequires:  pkgconfig(gthread-2.0) >= 2.28
-BuildRequires:  pkgconfig(libmirage) >= 2.0.0
+BuildRequires:  pkgconfig(libmirage) >= 2.1.0
 
 %description
 cdemu-daemon receives SCSI commands from kernel module thorugh the
@@ -54,7 +53,7 @@ The daemon registers itself on D-BUS's system or session bus
 that can be used by clients to control it.
 
 %prep
-%setup -Tcqa0
+%setup -q
 %patch -P 1 -p1
 
 %build
diff --git a/logfile.diff b/logfile.diff
index 62144ac..afab5d6 100644
--- a/logfile.diff
+++ b/logfile.diff
@@ -2,13 +2,13 @@
  system/cdemu-daemon-system.sh |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh
+Index: cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh
 ===================================================================
---- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh
-+++ cdemu-daemon-1.5.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=2
+ NUM_DEVICES=1
  AUDIO_DRIVER=null
 -LOG_FILE=/tmp/cdemu-daemon.log
 +LOG_FILE=/var/log/cdemu-daemon.log