From 7392d9acc40f1c686aaec2357d302bfe954891be0a1f56741da009d2a36b8efe Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 22 Dec 2012 17:08:21 +0000 Subject: [PATCH 1/5] cdemu-daemon-2.0.0 OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=9 --- cdemu-daemon-1.5.0.tar.bz2 | 3 --- cdemu-daemon-2.0.0.tar.bz2 | 3 +++ cdemu-daemon.changes | 6 ++++++ cdemu-daemon.spec | 19 +++++++++++-------- 4 files changed, 20 insertions(+), 11 deletions(-) delete mode 100644 cdemu-daemon-1.5.0.tar.bz2 create mode 100644 cdemu-daemon-2.0.0.tar.bz2 diff --git a/cdemu-daemon-1.5.0.tar.bz2 b/cdemu-daemon-1.5.0.tar.bz2 deleted file mode 100644 index 9e92fc0..0000000 --- a/cdemu-daemon-1.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0e122c7769ba11b640bb140657d1f31dc827904578437ac1d5aa84dcc88a74f -size 133865 diff --git a/cdemu-daemon-2.0.0.tar.bz2 b/cdemu-daemon-2.0.0.tar.bz2 new file mode 100644 index 0000000..511d0bd --- /dev/null +++ b/cdemu-daemon-2.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5410a02032e524ef64dbd81c9f09d2bc10e3f2ecd012d052c8c3e47e772356ca +size 61547 diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index f312282..898f924 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Dec 22 08:23:15 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 2.0.0 (up from 1.5.0) +* Support for new data types and file filters (see libmirage) + ------------------------------------------------------------------- Mon Nov 19 20:02:02 UTC 2012 - jengelh@inai.de diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index f948e32..8d69b83 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -17,7 +17,7 @@ Name: cdemu-daemon -Version: 1.5.0 +Version: 2.0.0 Release: 0 Summary: Device daemon for cdemu, a virtual CD-ROM device emulator License: GPL-2.0+ @@ -25,11 +25,12 @@ Group: System/Daemons Url: http://cdemu.sf.net/ #Freecode-URL: https://freecode.com/projects/cdemu-for-linux +#Git-Clone: git://git.code.sf.net/p/cdemu/code Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 Source3: cdemu-daemon.sysconfig Patch1: logfile.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildRequires: autoconf >= 2.59 +BuildRequires: cmake >= 2.8.5 BuildRequires: pkgconfig BuildRequires: pkgconfig(ao) >= 0.8.0 BuildRequires: pkgconfig(gio-2.0) >= 2.28 @@ -37,7 +38,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) >= 1.5.0 +BuildRequires: pkgconfig(libmirage) >= 2.0.0 %description cdemu-daemon receives SCSI commands from kernel module thorugh the @@ -51,11 +52,13 @@ The daemon registers itself on D-BUS's system or session bus that can be used by clients to control it. %prep -%setup -q +%setup -Tcqa0 %patch -P 1 -p1 %build -%configure +cmake . -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ + -DCMAKE_INSTALL_LIBEXECDIR:PATH="%_libexecdir" \ + -DCMAKE_C_FLAGS:STRING="%optflags"; make %{?_smp_mflags}; %install @@ -69,10 +72,10 @@ rm -Rf "$b/%_datadir/dbus-1/system-services" "$b/%_sysconfdir/dbus-1/system.d"; %files %defattr(-,root,root) -%_bindir/cdemud -%_libexecdir/cdemu-daemon-*.sh +%_bindir/cdemu-daemon +%_libexecdir/cdemu-daemon-session.sh %_datadir/dbus-1 -%_mandir/man8/cdemud.8* +%_mandir/man8/cdemu-daemon.8* %_localstatedir/adm/fillup-templates/sysconfig.cdemu-daemon %changelog From 58fa59f51791d6e871aee6a505cfe2350eccdb0f3dd36c03cb1aea8e82d79d92 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 22 Dec 2012 20:02:49 +0000 Subject: [PATCH 2/5] . OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=10 --- cdemu-daemon.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index 898f924..4f81408 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -2,7 +2,8 @@ Sat Dec 22 08:23:15 UTC 2012 - jengelh@inai.de - Update to new upstream release 2.0.0 (up from 1.5.0) -* Support for new data types and file filters (see libmirage) +* Support for ISZ, CSO, DMG, GBI, ECM, gzip and xz formats +* Partial support for 1-track MDX ------------------------------------------------------------------- Mon Nov 19 20:02:02 UTC 2012 - jengelh@inai.de From c340aeb1bf56e6d178fd1df46e93ba67198e4b2a4074902eaa80cc275ee327da Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 15 Mar 2013 22:48:08 +0000 Subject: [PATCH 3/5] BNC note OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=11 --- cdemu-daemon.changes | 1 + cdemu-daemon.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index 4f81408..dc742d7 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -4,6 +4,7 @@ Sat Dec 22 08:23:15 UTC 2012 - jengelh@inai.de - Update to new upstream release 2.0.0 (up from 1.5.0) * Support for ISZ, CSO, DMG, GBI, ECM, gzip and xz formats * Partial support for 1-track MDX +- Resolves a problem with autostarting cdemu-daemon (bnc#809181) ------------------------------------------------------------------- Mon Nov 19 20:02:02 UTC 2012 - jengelh@inai.de diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index 8d69b83..beed3f1 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -1,7 +1,7 @@ # # spec file for package cdemu-daemon # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 From 0ce130de4c3f5633199a7bc89daf8751e9798d644f0f713805822b8783757d25 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 15 Mar 2013 22:55:31 +0000 Subject: [PATCH 4/5] xz compression OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=12 --- cdemu-daemon-2.0.0.tar.bz2 | 3 --- cdemu-daemon-2.0.0.tar.xz | 3 +++ cdemu-daemon.spec | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 cdemu-daemon-2.0.0.tar.bz2 create mode 100644 cdemu-daemon-2.0.0.tar.xz diff --git a/cdemu-daemon-2.0.0.tar.bz2 b/cdemu-daemon-2.0.0.tar.bz2 deleted file mode 100644 index 511d0bd..0000000 --- a/cdemu-daemon-2.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5410a02032e524ef64dbd81c9f09d2bc10e3f2ecd012d052c8c3e47e772356ca -size 61547 diff --git a/cdemu-daemon-2.0.0.tar.xz b/cdemu-daemon-2.0.0.tar.xz new file mode 100644 index 0000000..7ce8320 --- /dev/null +++ b/cdemu-daemon-2.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71ebabddfb12bfe3eaeeb2321457d8f78a667b341094054432ee70c484e6f5a3 +size 62444 diff --git a/cdemu-daemon.spec b/cdemu-daemon.spec index beed3f1..0412b05 100644 --- a/cdemu-daemon.spec +++ b/cdemu-daemon.spec @@ -26,12 +26,14 @@ Url: http://cdemu.sf.net/ #Freecode-URL: https://freecode.com/projects/cdemu-for-linux #Git-Clone: git://git.code.sf.net/p/cdemu/code -Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 +#DL-URL: http://downloads.sf.net/cdemu/%name-%version.tar.bz2 +Source: %name-%version.tar.xz 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 From 344b25f689fdd0e8765c5db728c528161e6d52c97625f2be6786f492073fec5d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 18 Mar 2013 13:19:10 +0000 Subject: [PATCH 5/5] More bug numbers OBS-URL: https://build.opensuse.org/package/show/filesystems/cdemu-daemon?expand=0&rev=13 --- cdemu-daemon.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cdemu-daemon.changes b/cdemu-daemon.changes index dc742d7..954d467 100644 --- a/cdemu-daemon.changes +++ b/cdemu-daemon.changes @@ -4,7 +4,8 @@ Sat Dec 22 08:23:15 UTC 2012 - jengelh@inai.de - Update to new upstream release 2.0.0 (up from 1.5.0) * Support for ISZ, CSO, DMG, GBI, ECM, gzip and xz formats * Partial support for 1-track MDX -- Resolves a problem with autostarting cdemu-daemon (bnc#809181) +- Resolves a problem with autostarting cdemu-daemon + (bnc#809181, bnc#809862) ------------------------------------------------------------------- Mon Nov 19 20:02:02 UTC 2012 - jengelh@inai.de