- updated to 1.42

diff --git a/sg3_utils.spec b/sg3_utils.spec
index 1721867e4b69bae9472b1b352d0f80b55dfb19f1..e7bf6903711cdbffcd08fbb73f1f97b490cf71b1 100644 (file)
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -1,13 +1,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:       3
+Version:       1.42
+Release:       1
 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
+# Source0-md5: 913ac2c9069d2ba44e05565a445810ab
 URL:           http://sg.danny.cz/sg/sg3_utils.html
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
@@ -72,7 +71,6 @@ Reguły udev dla sg3_utils
 
 %prep
 %setup -q
-%patch0 -p1
 
 cp -p scripts/README README.scripts
 
@@ -102,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BSD_LICENSE COPYING COVERAGE CREDITS ChangeLog README README.scripts README.sg_start TODO
+%doc AUTHORS BSD_LICENSE COPYING COVERAGE CREDITS ChangeLog README README.scripts README.sg_start
 %attr(755,root,root) %{_bindir}/rescan-scsi-bus.sh
 %attr(755,root,root) %{_bindir}/scsi_*
 %attr(755,root,root) %{_bindir}/sg_*

diff --git a/udev_rules_fix.patch b/udev_rules_fix.patch
deleted file mode 100644 (file)
index 8b0da80..0000000
--- a/udev_rules_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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"