diff --git a/SPECS/sg3_utils.spec b/SPECS/sg3_utils.spec index a2e8311..a6085cf 100644 --- a/SPECS/sg3_utils.spec +++ b/SPECS/sg3_utils.spec @@ -2,8 +2,9 @@ Summary: Utilities for devices that use SCSI command sets Name: sg3_utils +Epoch: 1 Version: 1.37 -Release: 18%{?dist}.2 +Release: 19%{?dist} License: GPLv2+ and BSD Group: Applications/System Source0: http://sg.danny.cz/sg/p/sg3_utils-%{version}.tgz @@ -36,7 +37,7 @@ Patch15: BZ_1359286_sg_senddiag_fix_help.patch Patch16: BZ_1359292_sg_write_buffer_fix_help.patch Patch17: BZ_1601797_sg_turs_usage.patch URL: http://sg.danny.cz/sg/sg3_utils.html -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -63,7 +64,7 @@ This package contains the shared library for %{name}. %package devel Summary: Development library and header files for the sg3_utils library Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} Requires: glibc-headers %description devel @@ -111,10 +112,10 @@ install -p -m 755 scripts/%{rescan_script} $RPM_BUILD_ROOT%{_bindir} install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man8 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir}/ -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_udevrulesdir}/ -mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev/rules.d -install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/udev/ +mkdir -p $RPM_BUILD_ROOT%{_udevrulesdir} +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/udev +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_udevrulesdir}/63-fc-wwpn-id.rules +install -p -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/udev/ %post libs -p /sbin/ldconfig @@ -126,7 +127,7 @@ install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/udev/ %doc AUTHORS BSD_LICENSE COPYING COVERAGE CREDITS ChangeLog README README.sg_start %{_bindir}/* %{_mandir}/man8/* -%{_udevrulesdir}/59-fc-wwpn-id.rules +%{_udevrulesdir}/63-fc-wwpn-id.rules %{_prefix}/lib/udev/fc_wwpn_id %files libs @@ -139,10 +140,9 @@ install -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/udev/ %changelog -* Thu Jan 09 2020 Tomas Bzatek 1.37-18.el7_7.2 -- Fix the 59-fc-wwpn-id.rules syntax (#1788876) - -* Fri Aug 16 2019 Tomas Bzatek 1.37-18.el7_7.1 +* Fri Jan 10 2020 Tomas Bzatek 1:1.37-19 +- Reorder 59-fc-wwpn-id.rules to run after 60-persistent-storage.rules (#1785303) +- Fix the 59-fc-wwpn-id.rules syntax (#1750417) - Add 59-fc-wwpn-id.rules (#1684302) * Tue Feb 26 2019 Tomas Bzatek 1.37-18