From 3b586e7dd1f548b6744a3c12e878a105df49908757036c64da13c13c9eadadee Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 14 Jul 2014 11:33:34 +0000 Subject: [PATCH 1/2] Accepting request 240828 from home:XRevan86 OBS-URL: https://build.opensuse.org/request/show/240828 OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=13 --- vhba-kmp.changes | 5 ++++ vhba-kmp.spec | 49 ++++++++++++++++++------------------ vhba-module-20130607.tar.bz2 | 3 --- vhba-module-20140629.tar.bz2 | 3 +++ vhba-no-werror.diff | 6 ++--- 5 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 vhba-module-20130607.tar.bz2 create mode 100644 vhba-module-20140629.tar.bz2 diff --git a/vhba-kmp.changes b/vhba-kmp.changes index fed6a30..e992dce 100644 --- a/vhba-kmp.changes +++ b/vhba-kmp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 13 08:48:46 UTC 2014 - sor.alexei@meowr.ru + +- Update to 20140629 + ------------------------------------------------------------------- Sun Jun 9 14:14:21 UTC 2013 - jengelh@inai.de diff --git a/vhba-kmp.spec b/vhba-kmp.spec index a0a81d2..a4b9fe8 100644 --- a/vhba-kmp.spec +++ b/vhba-kmp.spec @@ -1,7 +1,7 @@ # # spec file for package vhba-kmp # -# 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,22 +17,20 @@ Name: vhba-kmp -Version: 20130607 +Version: 20140629 Release: 0 Summary: Virtual SCSI Host Bus Adapter License: GPL-2.0+ Group: System/Kernel -Url: http://cdemu.sf.net/ +Url: http://cdemu.sourceforge.net/about/vhba/ -#Freecode-URL: https://freecode.com/projects/cdemu-for-linux -Source: http://downloads.sf.net/cdemu/vhba-module-%version.tar.bz2 -Source2: %name-preamble -Patch3: vhba-no-werror.diff +Source: vhba-module-%{version}.tar.bz2 +Source2: %{name}-preamble +Patch1: vhba-no-werror.diff BuildRequires: kernel-syms >= 2.6.20 BuildRequires: modutils -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kernel_module_package -n vhba -p %name-preamble +%kernel_module_package -n vhba -p %{name}-preamble %description A Linux kernel module implementing a virtual SCSI Host Bus Adapter to @@ -53,26 +51,27 @@ part of the userspace cdemu suite, CD/DVD-ROM device emulator for Linux. %prep -%setup -qn vhba-module-%version -%patch -P 3 -p1 +echo %{flavors_to_build} +%setup -qn vhba-module-%{version} +%patch -P 1 -p1 %build -for flavor in %flavors_to_build; do - cp -a . "../obj-$flavor"; - pushd "../obj-$flavor/"; - make KDIR="/usr/src/linux-obj/%_target_cpu/$flavor" \ - %{?_smp_mflags}; - popd; -done; +for flavor in %{flavors_to_build}; do + cp -a . ../obj-$flavor/ + pushd ../obj-$flavor/ + make KDIR=/usr/src/linux-obj/%{_target_cpu}/$flavor \ + %{?_smp_mflags} + popd +done %install -export INSTALL_MOD_PATH="%buildroot"; +export INSTALL_MOD_PATH="%{buildroot}" -for flavor in %flavors_to_build; do - pushd "../obj-$flavor/"; - make KDIR="/usr/src/linux-obj/%_target_cpu/$flavor" \ - modules_install; - popd; -done; +for flavor in %{flavors_to_build}; do + pushd ../obj-$flavor/ + make KDIR=/usr/src/linux-obj/%{_target_cpu}/$flavor \ + modules_install + popd +done %changelog diff --git a/vhba-module-20130607.tar.bz2 b/vhba-module-20130607.tar.bz2 deleted file mode 100644 index 4a20b99..0000000 --- a/vhba-module-20130607.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2c4919d2904a8f880e2730250f7ed6e3143575d5c4de6b88a97c2228aa2a185 -size 15528 diff --git a/vhba-module-20140629.tar.bz2 b/vhba-module-20140629.tar.bz2 new file mode 100644 index 0000000..8a4b3f5 --- /dev/null +++ b/vhba-module-20140629.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e607cab56038ef4f5923c57279bbee4c2c0b57ce77e7003693d0938d09d6957 +size 15797 diff --git a/vhba-no-werror.diff b/vhba-no-werror.diff index 6d0ec6f..172b3e5 100644 --- a/vhba-no-werror.diff +++ b/vhba-no-werror.diff @@ -6,10 +6,10 @@ Upstream: tendency: no Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: vhba-module-20130607/Makefile +Index: vhba-module-20140629/Makefile =================================================================== ---- vhba-module-20130607.orig/Makefile -+++ vhba-module-20130607/Makefile +--- vhba-module-20140629.orig/Makefile ++++ vhba-module-20140629/Makefile @@ -8,7 +8,7 @@ KDIR ?= /lib/modules/$(KERNELRELEASE)/bu PWD ?= $(shell pwd) From 037e727c7699c6d7bf522fd7188f095440c328cb39b0496c86337ca2b9001b51 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 14 Jul 2014 11:37:18 +0000 Subject: [PATCH 2/2] Restore style and metadata fields, and add a changelog entry OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=14 --- vhba-kmp.changes | 3 ++- vhba-kmp.spec | 38 ++++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/vhba-kmp.changes b/vhba-kmp.changes index e992dce..be1e840 100644 --- a/vhba-kmp.changes +++ b/vhba-kmp.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Sun Jul 13 08:48:46 UTC 2014 - sor.alexei@meowr.ru -- Update to 20140629 +- Update to new upstream release 20140629 (cdemu-3.0.0) +* CD image write support ------------------------------------------------------------------- Sun Jun 9 14:14:21 UTC 2013 - jengelh@inai.de diff --git a/vhba-kmp.spec b/vhba-kmp.spec index a4b9fe8..e65d42e 100644 --- a/vhba-kmp.spec +++ b/vhba-kmp.spec @@ -22,15 +22,17 @@ Release: 0 Summary: Virtual SCSI Host Bus Adapter License: GPL-2.0+ Group: System/Kernel -Url: http://cdemu.sourceforge.net/about/vhba/ +Url: http://cdemu.sf.net/about/vhba/ -Source: vhba-module-%{version}.tar.bz2 -Source2: %{name}-preamble +#Git-Clone: git://git.code.sf.net/p/cdemu/code +Source: http://downloads.sf.net/cdemu/vhba-module-%version.tar.bz2 +Source2: %name-preamble Patch1: vhba-no-werror.diff BuildRequires: kernel-syms >= 2.6.20 BuildRequires: modutils +BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kernel_module_package -n vhba -p %{name}-preamble +%kernel_module_package -n vhba -p %name-preamble %description A Linux kernel module implementing a virtual SCSI Host Bus Adapter to @@ -51,27 +53,27 @@ part of the userspace cdemu suite, CD/DVD-ROM device emulator for Linux. %prep -echo %{flavors_to_build} -%setup -qn vhba-module-%{version} +echo %flavors_to_build +%setup -qn vhba-module-%version %patch -P 1 -p1 %build -for flavor in %{flavors_to_build}; do - cp -a . ../obj-$flavor/ - pushd ../obj-$flavor/ - make KDIR=/usr/src/linux-obj/%{_target_cpu}/$flavor \ - %{?_smp_mflags} - popd +for flavor in %flavors_to_build; do + cp -a . "../obj-$flavor/" + pushd "../obj-$flavor/" + make KDIR="/usr/src/linux-obj/%_target_cpu/$flavor" \ + %{?_smp_mflags} + popd done %install -export INSTALL_MOD_PATH="%{buildroot}" +export INSTALL_MOD_PATH="%buildroot" -for flavor in %{flavors_to_build}; do - pushd ../obj-$flavor/ - make KDIR=/usr/src/linux-obj/%{_target_cpu}/$flavor \ - modules_install - popd +for flavor in %flavors_to_build; do + pushd "../obj-$flavor/" + make KDIR="/usr/src/linux-obj/%_target_cpu/$flavor" \ + modules_install + popd done %changelog