From 0f7c80ccb6f8033244fd0413e29e23f958cffbbefc74ef286b997a8b4ba8ae16 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 15 Nov 2012 00:06:42 +0000 Subject: [PATCH 1/2] Add Freecode URL OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=6 --- cdemu-daemon.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index 7acbe6c..53e658d 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -14,6 +14,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: cdemu-daemon Version: 1.5.0 Release: 0 @@ -22,15 +24,20 @@ License: GPL-2.0+ Group: System/Daemons Url: http://cdemu.sf.net/ +#Freecode-URL: https://freecode.com/projects/cdemu-for-linux Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 -Source3: cdemu-daemon.sysconfig -Patch1: logfile.diff +Source3: cdemu-daemon.sysconfig +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 +BuildRequires: pkgconfig +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) >= 1.5.0 %description cdemu-daemon receives SCSI commands from kernel module thorugh the From 4b1ae0266e4892b921350ed9fe11c83374c9d2c75e9c318fe27d83e03dbd0253 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 19 Nov 2012 20:02:22 +0000 Subject: [PATCH 2/2] Remove cdemud-launch OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=7 --- cdemu-daemon.changes | 5 +++++ cdemu-daemon.spec | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index c26c734..f312282 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 19 20:02:02 UTC 2012 - jengelh@inai.de + +- Remove cdemud-launch helper, this caused too much confusion. + ------------------------------------------------------------------- Tue May 29 08:47:19 UTC 2012 - jengelh@inai.de diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index 53e658d..f948e32 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -62,13 +62,6 @@ make %{?_smp_mflags}; b="%buildroot"; make install DESTDIR="$b"; mkdir -p "$b/%_sbindir"; -cat >"$b/%_sbindir/cdemud-launch" <<-EOF; - #!/bin/sh - modprobe -q sg; - modprobe -q vhba; - exec /usr/bin/cdemud "$@"; -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"; # Not desired @@ -77,7 +70,6 @@ rm -Rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d"; %files %defattr(-,root,root) %_bindir/cdemud -%_sbindir/cdemud-launch %_libexecdir/cdemu-daemon-*.sh %_datadir/dbus-1 %_mandir/man8/cdemud.8*