From a4a6d88e82701a71cb5dad3c12e6024cf3dc76106e7331edab613bd6edc05973 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 6 Feb 2017 17:59:17 +0000
Subject: [PATCH 1/2] - Update to new upstream release 20161009

OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=22
---
 vhba-kmp-preamble            |  1 +
 vhba-kmp.changes             |  7 +++++++
 vhba-kmp.spec                | 20 ++++++++++++++++++--
 vhba-module-20140928.tar.bz2 |  3 ---
 vhba-module-20161009.tar.bz2 |  3 +++
 5 files changed, 29 insertions(+), 5 deletions(-)
 delete mode 100644 vhba-module-20140928.tar.bz2
 create mode 100644 vhba-module-20161009.tar.bz2

diff --git a/vhba-kmp-preamble b/vhba-kmp-preamble
index 220c2af..f250889 100644
--- a/vhba-kmp-preamble
+++ b/vhba-kmp-preamble
@@ -1,2 +1,3 @@
 Enhances:	kernel-%1
 Requires:	kernel-%1
+Requires:	vhba-rules
diff --git a/vhba-kmp.changes b/vhba-kmp.changes
index a69787c..855b526 100644
--- a/vhba-kmp.changes
+++ b/vhba-kmp.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb  6 17:35:38 UTC 2017 - jengelh@inai.de
+
+- Update to new upstream release 20161009
+  * Documentation updates
+- Set udev "uaccess" tag for /dev/vhba_ctl
+
 -------------------------------------------------------------------
 Wed Dec  9 17:19:01 UTC 2015 - jengelh@inai.de
 
diff --git a/vhba-kmp.spec b/vhba-kmp.spec
index d08664d..0befa3f 100644
--- a/vhba-kmp.spec
+++ b/vhba-kmp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package vhba-kmp
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX 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,7 +17,7 @@
 
 
 Name:           vhba-kmp
-Version:        20140928
+Version:        20161009
 Release:        0
 Summary:        Virtual SCSI Host Bus Adapter
 License:        GPL-2.0+
@@ -42,6 +42,14 @@ a virtual SCSI adapter which can have multiple virtual devices. It is
 part of the userspace cdemu suite, CD/DVD-ROM device emulator for
 Linux.
 
+%package -n vhba-rules
+Summary:        System configuration for the vhba module
+Group:          System/Kernel
+
+%description -n vhba-rules
+This subpackage contains udev rules for use with vhba_ctl
+to unlock the device node for local users.
+
 %package KMP
 Summary:        Virtual SCSI Host Bus adapter
 Group:          System/Kernel
@@ -77,4 +85,12 @@ for flavor in %flavors_to_build; do
 	popd
 done
 
+b="%buildroot//usr/lib/udev/rules.d"
+mkdir -p "$b"
+echo 'KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"' >"$b/70-vhba.rules"
+
+%files -n vhba-rules
+%defattr(-,root,root)
+/usr/lib/udev/rules.d/*.rules
+
 %changelog
diff --git a/vhba-module-20140928.tar.bz2 b/vhba-module-20140928.tar.bz2
deleted file mode 100644
index ff7c260..0000000
--- a/vhba-module-20140928.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45f56e4972b5aa7175903307901ca42d29da6fc8f92ab4c47007f53bc5bb55a2
-size 15571
diff --git a/vhba-module-20161009.tar.bz2 b/vhba-module-20161009.tar.bz2
new file mode 100644
index 0000000..dc6a475
--- /dev/null
+++ b/vhba-module-20161009.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd062d8bd61ccb8137622f837a0dadb771cc935981d8bccb2ad4de0bd11f33d9
+size 15623

From eb37e59a0711483f5355dccfbe5625841c1403583b1298d6e3a8a5380325a3e4 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 6 Feb 2017 19:16:02 +0000
Subject: [PATCH 2/2] move rules to cdemu-daemon

OBS-URL: https://build.opensuse.org/package/show/filesystems/vhba-kmp?expand=0&rev=23
---
 vhba-kmp-preamble |  1 -
 vhba-kmp.changes  |  1 -
 vhba-kmp.spec     | 16 ----------------
 3 files changed, 18 deletions(-)

diff --git a/vhba-kmp-preamble b/vhba-kmp-preamble
index f250889..220c2af 100644
--- a/vhba-kmp-preamble
+++ b/vhba-kmp-preamble
@@ -1,3 +1,2 @@
 Enhances:	kernel-%1
 Requires:	kernel-%1
-Requires:	vhba-rules
diff --git a/vhba-kmp.changes b/vhba-kmp.changes
index 855b526..02bcb8d 100644
--- a/vhba-kmp.changes
+++ b/vhba-kmp.changes
@@ -3,7 +3,6 @@ Mon Feb  6 17:35:38 UTC 2017 - jengelh@inai.de
 
 - Update to new upstream release 20161009
   * Documentation updates
-- Set udev "uaccess" tag for /dev/vhba_ctl
 
 -------------------------------------------------------------------
 Wed Dec  9 17:19:01 UTC 2015 - jengelh@inai.de
diff --git a/vhba-kmp.spec b/vhba-kmp.spec
index 0befa3f..202bf93 100644
--- a/vhba-kmp.spec
+++ b/vhba-kmp.spec
@@ -42,14 +42,6 @@ a virtual SCSI adapter which can have multiple virtual devices. It is
 part of the userspace cdemu suite, CD/DVD-ROM device emulator for
 Linux.
 
-%package -n vhba-rules
-Summary:        System configuration for the vhba module
-Group:          System/Kernel
-
-%description -n vhba-rules
-This subpackage contains udev rules for use with vhba_ctl
-to unlock the device node for local users.
-
 %package KMP
 Summary:        Virtual SCSI Host Bus adapter
 Group:          System/Kernel
@@ -85,12 +77,4 @@ for flavor in %flavors_to_build; do
 	popd
 done
 
-b="%buildroot//usr/lib/udev/rules.d"
-mkdir -p "$b"
-echo 'KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"' >"$b/70-vhba.rules"
-
-%files -n vhba-rules
-%defattr(-,root,root)
-/usr/lib/udev/rules.d/*.rules
-
 %changelog