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

@@ -0,0 +1 @@
+KERNEL=="vhba_ctl", NAME="%k", MODE="0660", OWNER="root", GROUP="cdrom"

cdemu-daemon-2.1.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d26782071184d555b06ad5def7d1c22916cbeb73377328879499b91e1196f36f
-size 62600

cdemu-daemon-3.0.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ecfdea0a57b35f5007b63882ca33d2edb568244aa854b5e5c30ffbbf3ba4f56
+size 76131

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
 

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
+Source1:        %name.sysconfig
-Patch1:         logfile.diff
+Source2:        60-vhba.rules
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
 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" \
+cmake . \
-	-DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \
+   -DCMAKE_INSTALL_PREFIX:PATH="%_prefix"         \
-	-DCMAKE_C_FLAGS:STRING="%optflags";
+   -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \
-make %{?_smp_mflags};
+   -DCMAKE_C_FLAGS:STRING="%optflags"
+make %{?_smp_mflags}
 
 %install
-b="%buildroot";
+%make_install
-make install DESTDIR="$b";
+mkdir -p "%buildroot/%_sbindir" "%buildroot/%_localstatedir/adm/fillup-templates"
-mkdir -p "$b/%_sbindir";
+install -Dm 0644 "%SOURCE1" "%buildroot/%_localstatedir/adm/fillup-templates/sysconfig.%name"
-mkdir -p "$b/%_localstatedir/adm/fillup-templates";
+install -Dm 0644 "%SOURCE2" "%buildroot/%_prefix/lib/udev/rules.d/60-vhba.rules"
-install -pm0644 "%{S:3}" "$b/%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon";
 # 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
+%doc AUTHORS COPYING README
-%_libexecdir/cdemu-daemon-session.sh
+%_bindir/%name
-%_datadir/dbus-1
+%_libexecdir/%name-session.sh
-%_mandir/man8/cdemu-daemon.8*
+%_localstatedir/adm/fillup-templates/sysconfig.%name
-%_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon
+%_mandir/man8/%name.8*
+%_datadir/dbus-1/
+%_prefix/lib/udev/
 
 %changelog

logfile.diff

@@ -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