From bef7b6a69ca28586c8dcdecb93705d246ca64ddd44b1aeecbd1d24d3ded77985 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 14 Jul 2014 14:22:16 +0000
Subject: [PATCH 1/5] Accepting request 240954 from home:XRevan86

OBS-URL: https://build.opensuse.org/request/show/240954
OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=21
---
 60-vhba.rules              |  1 +
 cdemu-daemon-2.1.1.tar.bz2 |  3 ---
 cdemu-daemon-3.0.0.tar.bz2 |  3 +++
 cdemu-daemon.changes       |  7 ++++++
 cdemu-daemon.spec          | 49 +++++++++++++++++++-------------------
 logfile.diff               | 17 -------------
 6 files changed, 35 insertions(+), 45 deletions(-)
 create mode 100644 60-vhba.rules
 delete mode 100644 cdemu-daemon-2.1.1.tar.bz2
 create mode 100644 cdemu-daemon-3.0.0.tar.bz2
 delete mode 100644 logfile.diff

diff --git a/60-vhba.rules b/60-vhba.rules
new file mode 100644
index 0000000..5b47cb8
--- /dev/null
+++ b/60-vhba.rules
@@ -0,0 +1 @@
+KERNEL=="vhba_ctl", NAME="%k", MODE="0660", OWNER="root", GROUP="cdrom"
diff --git a/cdemu-daemon-2.1.1.tar.bz2 b/cdemu-daemon-2.1.1.tar.bz2
deleted file mode 100644
index 7bd328d..0000000
--- a/cdemu-daemon-2.1.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d26782071184d555b06ad5def7d1c22916cbeb73377328879499b91e1196f36f
-size 62600
diff --git a/cdemu-daemon-3.0.0.tar.bz2 b/cdemu-daemon-3.0.0.tar.bz2
new file mode 100644
index 0000000..e4bcf22
--- /dev/null
+++ b/cdemu-daemon-3.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ecfdea0a57b35f5007b63882ca33d2edb568244aa854b5e5c30ffbbf3ba4f56
+size 76131
diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes
index febaa1b..4ec6b37 100644
--- a/cdemu-daemon.changes
+++ b/cdemu-daemon.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Jul 13 08:48:46 UTC 2014 - sor.alexei@meowr.ru
+
+- Update to 3.0.0
+- Remove logfile.diff patch
+- Add /dev/vhba_ctl read-write access udev rule
+
 -------------------------------------------------------------------
 Sun Nov 24 11:23:28 UTC 2013 - jengelh@inai.de
 
diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec
index 3c440bc..af840af 100644
--- a/cdemu-daemon.spec
+++ b/cdemu-daemon.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cdemu-daemon
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,20 +17,18 @@
 
 
 Name:           cdemu-daemon
-Version:        2.1.1
+Version:        3.0.0
 Release:        0
 Summary:        Device daemon for cdemu, a virtual CD-ROM device emulator
 License:        GPL-2.0+
 Group:          System/Daemons
-Url:            http://cdemu.sf.net/
+Url:            http://cdemu.sf.net/about/daemon/
 
-#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:         http://downloads.sf.net/cdemu/%name-%version.tar.bz2
-Source3:        cdemu-daemon.sysconfig
-Patch1:         logfile.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source1:        %name.sysconfig
+Source2:        60-vhba.rules
+
 BuildRequires:  cmake >= 2.8.5
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(ao) >= 0.8.0
@@ -39,7 +37,7 @@ 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.1.1
+BuildRequires:  pkgconfig(libmirage) >= 3.0.0
 
 %description
 cdemu-daemon receives SCSI commands from kernel module thorugh the
@@ -54,29 +52,30 @@ that can be used by clients to control it.
 
 %prep
 %setup -q
-%patch -P 1 -p1
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \
-	-DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \
-	-DCMAKE_C_FLAGS:STRING="%optflags";
-make %{?_smp_mflags};
+cmake . \
+   -DCMAKE_INSTALL_PREFIX:PATH="%_prefix"         \
+   -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \
+   -DCMAKE_C_FLAGS:STRING="%optflags"
+make %{?_smp_mflags}
 
 %install
-b="%buildroot";
-make install DESTDIR="$b";
-mkdir -p "$b/%_sbindir";
-mkdir -p "$b/%_localstatedir/adm/fillup-templates";
-install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon";
+%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 "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d";
+rm -rf "%buildroot/%_datadir/dbus-1/system-services" "%buildroot/%_sysconfdir/dbus-1/system.d/"
 
 %files
 %defattr(-,root,root)
-%_bindir/cdemu-daemon
-%_libexecdir/cdemu-daemon-session.sh
-%_datadir/dbus-1
-%_mandir/man8/cdemu-daemon.8*
-%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon
+%doc AUTHORS COPYING README
+%_bindir/%name
+%_libexecdir/%name-session.sh
+%_localstatedir/adm/fillup-templates/sysconfig.%name
+%_mandir/man8/%name.8*
+%_datadir/dbus-1/
+%_prefix/lib/udev/
 
 %changelog
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

From fcc8c06a32929d6b39e997f34f7226ee5a8efb4ec62cd9234f4ef4ff243fb3a9 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 14 Jul 2014 14:25:18 +0000
Subject: [PATCH 2/5] 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/
 

From aa134736dcad0d682ef5d25b85a7040bfb94e5a16b5375b32b1896c2d9ed044a Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 14 Jul 2014 14:27:43 +0000
Subject: [PATCH 3/5] Restore logfile.diff

OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=23
---
 cdemu-daemon.spec |  9 +++++----
 logfile.diff      | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 logfile.diff

diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec
index cf7892c..60b2719 100644
--- a/cdemu-daemon.spec
+++ b/cdemu-daemon.spec
@@ -28,7 +28,7 @@ Url:            http://cdemu.sf.net/about/daemon/
 Source:         http://downloads.sf.net/cdemu/%name-%version.tar.bz2
 Source1:        cdemu-daemon.sysconfig
 Source2:        60-vhba.rules
-
+Patch1:         logfile.diff
 BuildRequires:  cmake >= 2.8.5
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(ao) >= 0.8.0
@@ -52,12 +52,13 @@ that can be used by clients to control it.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %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
diff --git a/logfile.diff b/logfile.diff
new file mode 100644
index 0000000..afab5d6
--- /dev/null
+++ b/logfile.diff
@@ -0,0 +1,17 @@
+---
+ 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

From 521e6cdd7f901653c775e41abb69d45424b03586a4e9a7f57fdaf99558642adf Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 14 Jul 2014 14:31:03 +0000
Subject: [PATCH 4/5] Revert back to original lines to cut down the diff

OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=24
---
 cdemu-daemon.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec
index 60b2719..c5a3488 100644
--- a/cdemu-daemon.spec
+++ b/cdemu-daemon.spec
@@ -26,8 +26,8 @@ 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:        cdemu-daemon.sysconfig
 Source2:        60-vhba.rules
+Source3:        cdemu-daemon.sysconfig
 Patch1:         logfile.diff
 BuildRequires:  cmake >= 2.8.5
 BuildRequires:  pkgconfig
@@ -65,8 +65,8 @@ make %{?_smp_mflags}
 b="%buildroot"
 %make_install
 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"
+install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules"
+install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/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/"
 
@@ -75,9 +75,9 @@ rm -rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d/"
 %doc AUTHORS COPYING README
 %_bindir/cdemu-daemon
 %_libexecdir/cdemu-daemon-session.sh
-%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon
-%_mandir/man8/cdemu-daemon.8*
 %_datadir/dbus-1/
+%_mandir/man8/cdemu-daemon.8*
+%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon
 %_prefix/lib/udev/
 
 %changelog

From 04fe99d8f864467511f4cd9198d186ae1e28acb127fc3c4fe3ee3c282de8adad Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 14 Jul 2014 14:31:59 +0000
Subject: [PATCH 5/5] OBS-URL:
 https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=25

---
 cdemu-daemon.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec
index c5a3488..18ac4cc 100644
--- a/cdemu-daemon.spec
+++ b/cdemu-daemon.spec
@@ -64,7 +64,8 @@ make %{?_smp_mflags}
 %install
 b="%buildroot"
 %make_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"
 install -pm0644 "%{S:2}" "$b/%_prefix/lib/udev/rules.d/60-vhba.rules"
 install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon"
 # Not desired for security; it would permit a user to start a system service.