From: Marcin Krol <hawk@tld-linux.org>
Date: Fri, 7 Aug 2015 18:31:03 +0000 (+0000)
Subject: - fix syntax error in udev rules
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=31670a655e15dc38323e6984644f4a8f609d024f;p=packages%2Fsg3_utils.git

- fix syntax error in udev rules
---

diff --git a/sg3_utils.spec b/sg3_utils.spec
index 263587e..9d36359 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -2,11 +2,12 @@ Summary:	Utilities and test programs for the Linux sg version 3 device driver
 Summary(pl.UTF-8):	Programy narzędziowe i testowe dla linuksowego sterownika sg w wersji 3
 Name:		sg3_utils
 Version:	1.41
-Release:	1
+Release:	2
 License:	GPL v2 (utilities), BSD (library)
 Group:		Applications/System
 Source0:	http://sg.danny.cz/sg/p/%{name}-%{version}.tar.xz
 # Source0-md5:	79c8e3c0b2e4bad7dcba3e1ab090f3b4
+Patch0:		udev_rules_fix.patch
 URL:		http://sg.danny.cz/sg/sg3_utils.html
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -58,6 +59,7 @@ Statyczna wersja biblioteki sgutils2.
 
 %prep
 %setup -q
+%patch0 -p1
 
 cp -p scripts/README README.scripts
 
diff --git a/udev_rules_fix.patch b/udev_rules_fix.patch
new file mode 100644
index 0000000..8b0da80
--- /dev/null
+++ b/udev_rules_fix.patch
@@ -0,0 +1,13 @@
+diff -ur sg3_utils-1.41.orig/scripts/58-scsi-sg3_symlink.rules sg3_utils-1.41/scripts/58-scsi-sg3_symlink.rules
+--- sg3_utils-1.41.orig/scripts/58-scsi-sg3_symlink.rules	2014-12-21 00:42:18.000000000 +0000
++++ sg3_utils-1.41/scripts/58-scsi-sg3_symlink.rules	2015-08-07 18:29:40.051493300 +0000
+@@ -14,8 +14,7 @@
+ # NAA identifier (prefix 3)
+ # 1: IEEE Registered Extended first
+ ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}"
+-ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="partition",
+-# SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}-part%n"
++ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REGEXT}-part%n"
+ # 2: IEEE Registered
+ ENV{SCSI_IDENT_LUN_NAA_REG}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REG}"
+ ENV{SCSI_IDENT_LUN_NAA_REG}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA_REG}-part%n"