renumber some patches in the spec file
make more room for upstream patches to backport in cleanly Resolves: #948134
This commit is contained in:
parent
374005d4a3
commit
11189d126b
@ -57,29 +57,29 @@ Patch40: 0040-iscsi-tools-Correctly-get-username_in-and-password_i.patch
|
|||||||
Patch41: 0041-README-changes-for-adding-support-to-set-CHAP-entry.patch
|
Patch41: 0041-README-changes-for-adding-support-to-set-CHAP-entry.patch
|
||||||
|
|
||||||
# not (yet) upstream merged
|
# not (yet) upstream merged
|
||||||
Patch43: 0043-idmb_rec_write-check-for-tpgt-first.patch
|
Patch143: 0143-idmb_rec_write-check-for-tpgt-first.patch
|
||||||
Patch45: 0045-idbm_rec_write-seperate-old-and-new-style-writes.patch
|
Patch145: 0145-idbm_rec_write-seperate-old-and-new-style-writes.patch
|
||||||
Patch46: 0046-idbw_rec_write-pick-tpgt-from-existing-record.patch
|
Patch146: 0146-idbw_rec_write-pick-tpgt-from-existing-record.patch
|
||||||
Patch47: 0047-iscsiuio-systemd-socket-activation-support.patch
|
Patch147: 0147-iscsiuio-systemd-socket-activation-support.patch
|
||||||
Patch49: 0049-update-systemd-service-files-add-iscsi.service-for-s.patch
|
Patch149: 0149-update-systemd-service-files-add-iscsi.service-for-s.patch
|
||||||
Patch50: 0050-iscsi-boot-related-service-file-updates.patch
|
Patch150: 0150-iscsi-boot-related-service-file-updates.patch
|
||||||
# distro specific modifications
|
# distro specific modifications
|
||||||
Patch51: 0051-update-initscripts-and-docs.patch
|
Patch151: 0151-update-initscripts-and-docs.patch
|
||||||
Patch52: 0052-use-var-for-config.patch
|
Patch152: 0152-use-var-for-config.patch
|
||||||
Patch53: 0053-use-red-hat-for-name.patch
|
Patch153: 0153-use-red-hat-for-name.patch
|
||||||
Patch54: 0054-add-libiscsi.patch
|
Patch154: 0154-add-libiscsi.patch
|
||||||
Patch55: 0055-dont-use-static.patch
|
Patch155: 0155-dont-use-static.patch
|
||||||
Patch56: 0056-remove-the-offload-boot-supported-ifdef.patch
|
Patch156: 0156-remove-the-offload-boot-supported-ifdef.patch
|
||||||
Patch59: 0059-iscsiuio-systemd-unit-files.patch
|
Patch159: 0159-iscsiuio-systemd-unit-files.patch
|
||||||
Patch60: 0060-use-systemctl-to-start-iscsid.patch
|
Patch160: 0160-use-systemctl-to-start-iscsid.patch
|
||||||
Patch61: 0061-resolve-565245-multilib-issues-caused-by-doxygen.patch
|
Patch161: 0161-resolve-565245-multilib-issues-caused-by-doxygen.patch
|
||||||
Patch62: 0062-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
|
Patch162: 0162-Don-t-check-for-autostart-sessions-if-iscsi-is-not-u.patch
|
||||||
Patch63: 0063-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
|
Patch163: 0163-fix-order-of-setting-uid-gid-and-drop-supplementary-.patch
|
||||||
Patch64: 0064-libiscsi-fix-incorrect-strncpy-use.patch
|
Patch164: 0164-libiscsi-fix-incorrect-strncpy-use.patch
|
||||||
Patch65: 0065-fix-hardened-build-of-iscsiuio.patch
|
Patch165: 0165-fix-hardened-build-of-iscsiuio.patch
|
||||||
Patch66: 0066-start-socket-listeners-on-iscsiadm-command.patch
|
Patch166: 0166-start-socket-listeners-on-iscsiadm-command.patch
|
||||||
# version string, needs to be updated with each build
|
# version string, needs to be updated with each build
|
||||||
Patch99: 0099-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
|
Patch199: 0199-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
|
||||||
|
|
||||||
BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel
|
BuildRequires: flex bison python-devel doxygen kmod-devel systemd-devel
|
||||||
# For dir ownership
|
# For dir ownership
|
||||||
@ -150,29 +150,29 @@ developing applications that use %{name}.
|
|||||||
%patch40 -p1
|
%patch40 -p1
|
||||||
%patch41 -p1
|
%patch41 -p1
|
||||||
# pending upstream merge
|
# pending upstream merge
|
||||||
%patch43 -p1
|
%patch143 -p1
|
||||||
%patch45 -p1
|
%patch145 -p1
|
||||||
%patch46 -p1
|
%patch146 -p1
|
||||||
%patch47 -p1
|
%patch147 -p1
|
||||||
%patch49 -p1
|
%patch149 -p1
|
||||||
%patch50 -p1
|
%patch150 -p1
|
||||||
# distro specific modifications
|
# distro specific modifications
|
||||||
%patch51 -p1
|
%patch151 -p1
|
||||||
%patch52 -p1
|
%patch152 -p1
|
||||||
%patch53 -p1
|
%patch153 -p1
|
||||||
%patch54 -p1
|
%patch154 -p1
|
||||||
%patch55 -p1
|
%patch155 -p1
|
||||||
%patch56 -p1
|
%patch156 -p1
|
||||||
%patch59 -p1
|
%patch159 -p1
|
||||||
%patch60 -p1
|
%patch160 -p1
|
||||||
%patch61 -p1
|
%patch161 -p1
|
||||||
%patch62 -p1
|
%patch162 -p1
|
||||||
%patch63 -p1
|
%patch163 -p1
|
||||||
%patch64 -p1
|
%patch164 -p1
|
||||||
%patch65 -p1
|
%patch165 -p1
|
||||||
%patch66 -p1
|
%patch166 -p1
|
||||||
# version string
|
# version string
|
||||||
%patch99 -p1
|
%patch199 -p1
|
||||||
|
|
||||||
# change exec_prefix, there's no easy way to override
|
# change exec_prefix, there's no easy way to override
|
||||||
%{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile
|
%{__sed} -i -e 's|^exec_prefix = /$|exec_prefix = %{_exec_prefix}|' Makefile
|
||||||
|
Loading…
Reference in New Issue
Block a user