From 8f436e9b969a2231186fefe552aa896521d457674eb71c67b474b2c31c22a76d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 29 May 2012 08:50:16 +0000
Subject: [PATCH] bnc#764063

OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=2
---
 cdemu-daemon.changes |  6 ++++++
 cdemu-daemon.spec    | 38 ++++----------------------------------
 logfile.diff         | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 34 deletions(-)
 create mode 100644 logfile.diff

diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes
index 10ba782..c26c734 100644
--- a/cdemu-daemon.changes
+++ b/cdemu-daemon.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 29 08:47:19 UTC 2012 - jengelh@inai.de
+
+- Remove dbus autostart and systemd unit file for system-bus mode.
+  Place system logfile in proper place (bnc#764063)
+
 -------------------------------------------------------------------
 Tue May  8 22:39:47 UTC 2012 - jengelh@inai.de
 
diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec
index 547ba02..7cfb801 100644
--- a/cdemu-daemon.spec
+++ b/cdemu-daemon.spec
@@ -23,19 +23,14 @@ Group:          System/Daemons
 Url:            http://cdemu.sf.net/
 
 Source:         http://downloads.sf.net/cdemu/%name-%version.tar.bz2
-Source2:	%name-rpmlintrc
 Source3:	cdemu-daemon.sysconfig
-Source4:	cdemu-daemon.service
+Patch1:		logfile.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #BuildRequires:	autoconf >= 2.59
 BuildRequires:	pkgconfig pkgconfig(glib-2.0) >= 2.28
 BuildRequires:	pkgconfig(gobject-2.0) >= 2.28 pkgconfig(gmodule-2.0) >= 2.28
 BuildRequires:	pkgconfig(gthread-2.0) >= 2.28, pkgconfig(gio-2.0) >= 2.28
 BuildRequires:	pkgconfig(ao) >= 0.8.0, pkgconfig(libmirage) >= 1.5.0
-%if 0%{?suse_version} >= 1210
-BuildRequires:	systemd
-%systemd_requires
-%endif
 
 %description
 cdemu-daemon receives SCSI commands from kernel module thorugh the
@@ -50,6 +45,7 @@ that can be used by clients to control it.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
 %configure
@@ -68,31 +64,8 @@ EOF
 chmod a+x "$b/%_sbindir/cdemud-launch";
 mkdir -p "$b/%_localstatedir/adm/fillup-templates";
 install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon";
-%if %{?_unitdir:1}
-mkdir -p "$b/%_unitdir";
-install -pm0644 "%{S:4}" "$b/%_unitdir/";
-%endif
-
-%if %{?_unitdir:1}
-%pre
-%service_add_pre cdemu-daemon.service
-%endif
-
-%post
-%fillup_and_insserv -i
-%if %{?_unitdir:1}
-%service_add_post cdemu-daemon.service
-%endif
-
-%if %{?_unitdir:1}
-%preun
-%service_del_preun cdemu-daemon.service
-%endif
-
-%if %{?_unitdir:1}
-%postun
-%service_del_postun cdemu-daemon.service
-%endif
+# Not desired
+rm -Rf "$b/%_datadir/dbus-1/system-services";
 
 %files
 %defattr(-,root,root)
@@ -105,8 +78,5 @@ install -pm0644 "%{S:4}" "$b/%_unitdir/";
 %_datadir/dbus-1
 %_mandir/man8/cdemud.8*
 %_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon
-%if %{?_unitdir:1}
-%_unitdir/*
-%endif
 
 %changelog
diff --git a/logfile.diff b/logfile.diff
new file mode 100644
index 0000000..62144ac
--- /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-1.5.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
+@@ -6,7 +6,7 @@
+ # Default settings
+ NUM_DEVICES=2
+ 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