- missing patch

[packages/sg3_utils.git] / sg3_utils.spec

diff --git a/sg3_utils.spec b/sg3_utils.spec
index 1721867e4b69bae9472b1b352d0f80b55dfb19f1..8f8d1406c845fad8f66d8c59a5d1dab837e3e700 100644 (file)
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -1,22 +1,27 @@
+#
+# Conditional build:
+%bcond_without static_libs     # static library
+
 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.48
+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: 0024393d2d2942cc081ce613d98db68a
+Patch0:                %{name}-rescan-scsi-bus.sh.patch
 URL:           http://sg.danny.cz/sg/sg3_utils.html
+BuildRequires: rpmbuild(macros) >= 1.527
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 # see scripts/rescan-scsi-bus.sh /Id:
 Provides:      rescan-scsi-bus = 1.57
 Provides:      sg_utils
 Obsoletes:     rescan-scsi-bus < 1.57
-Obsoletes:     scsiutils
-Obsoletes:     sg_utils
+Obsoletes:     scsiutils < 1.8
+Obsoletes:     sg_utils < 1.03
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %undefine      __cxx
@@ -72,12 +77,12 @@ Reguły udev dla sg3_utils
 
 %prep
 %setup -q
-%patch0 -p1
 
 cp -p scripts/README README.scripts
 
 %build
-%configure
+%configure \
+       %{__enable_disable static_libs static}
 %{__make}
 
 %install
@@ -102,18 +107,19 @@ 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_*
 %attr(755,root,root) %{_bindir}/sginfo
 %attr(755,root,root) %{_bindir}/sgm_dd
 %attr(755,root,root) %{_bindir}/sgp_dd
-%attr(755,root,root) %{_libdir}/libsgutils2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsgutils2.so.2
+%attr(755,root,root) %{_libdir}/libsgutils2-%{version}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsgutils2-%{version}.so.2
 %{_mandir}/man8/rescan-scsi-bus.sh.8*
 %{_mandir}/man8/scsi_*.8*
 %{_mandir}/man8/sg3_utils.8*
+%{_mandir}/man8/sg3_utils_json.8*
 %{_mandir}/man8/sg_*.8*
 %{_mandir}/man8/sginfo.8*
 %{_mandir}/man8/sgm_dd.8*
@@ -124,11 +130,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libsgutils2.so
 %{_includedir}/scsi/sg_*.h
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libsgutils2.a
+%endif
 
 %files udev
 %defattr(644,root,root,755)
+/lib/udev/rules.d/00-scsi-sg3_config.rules
+/lib/udev/rules.d/40-usb-blacklist.rules
+/lib/udev/rules.d/54-before-scsi-sg3_id.rules
 /lib/udev/rules.d/55-scsi-sg3_id.rules
 /lib/udev/rules.d/58-scsi-sg3_symlink.rules
+/lib/udev/rules.d/59-fc-wwpn-id.rules
+/lib/udev/rules.d/59-scsi-cciss_id.rules