Accepting request 516127 from home:hreinecke:branches:Base:System

- Drop patch merged with git repository
  * drop add-lunsearch-filter-to-searchexisting.patch
- Drop rules included in git repository
  * drop 40-usb-blacklist.rules
- Update to latest svn snapshot:
  * sg_rdac: add sanity checks for -f=lun value
  * sg_vpd improvements
  * sg_ses: fix uninitialized struct
  * sg_luns: resync with SAM and SPC drafts
  * sg_vpd: fix struct misalignment introduced by --force
  * sg_logs: add --vendor and fixup enumeration
- Port patches from SLES:
  * Add systemd service files for LUN masking (bsc#954600)
  * 55-scsi-sg3_id.rules: handle VPD page 0x80 correctly (bsc#1006469)
  * scripts: added udev rules for legacy CCISS (bsc#1006175)
  * rescan-scsi-bus.sh: Add lunsearch filter to findresized()
  (bsc#1027176)
  * Add fc_wwpn_id to generate by-path links for fibrechannel
  (bsc#1005063)
  * 55-scsi-sg3_id.rules: allow to override sysfs inquiry
  (bsc#1012523)
  * sg_inq: export all NAA values (bsc#1050767)
  * Silence gcc warnings

OBS-URL: https://build.opensuse.org/request/show/516127
OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=65

sg3_utils.spec

@@ -26,9 +26,7 @@ Group:          Hardware/Other
 Url:            http://sg.danny.cz/sg/sg3_utils.html
 
 Source:         sg3_utils-%{version}.tar.xz
-Source1:        40-usb-blacklist.rules
 Patch1:         sgut-libversioning.diff
-Patch2:         add-lunsearch-filter-to-searchexisting.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libtool
 BuildRequires:  udev
@@ -84,7 +82,6 @@ applications that want to make use of libsgutils.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 
 %build
 autoreconf -fi
@@ -99,7 +96,7 @@ install -m 644 doc/rescan-scsi-bus.sh.8 $RPM_BUILD_ROOT%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m 644 scripts/55-scsi-sg3_id.rules $RPM_BUILD_ROOT%{_udevrulesdir}
 install -m 644 scripts/58-scsi-sg3_symlink.rules $RPM_BUILD_ROOT%{_udevrulesdir}
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_udevrulesdir}
+install -m 644 scripts/40-usb-blacklist.rules $RPM_BUILD_ROOT%{_udevrulesdir}
 rm -f %{buildroot}%{_libdir}/*.la
 
 %post   -p /sbin/ldconfig -n %lname