Accepting request 215431 from network

- Replaced 8 patches with one. No functional change (forwarded request 215430 from lee_duncan)

OBS-URL: https://build.opensuse.org/request/show/215431
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-iscsi?expand=0&rev=38
This commit is contained in:
Stephan Kulow 2014-01-29 12:08:58 +00:00 committed by Git OBS Bridge
commit 1c22c7609b
11 changed files with 20 additions and 39 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:904d2a8f9d6840e44004dbbc8e994aa83c6fc4ad2e6392a766bb8f08930724b5
size 127035

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b81334fc4bc824ac09d3797cf5dc78f50f696fbabb6a45dd77b99ab29fe06d37
size 5484

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce5aee342de97ba7ea464f9ce213f78b4cd2606eef320fb4ee9ad092342ed3e7
size 7106

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d54c0122aac76507ba99c1bc9a77f5f4426c638909d4d1fd884901e8d6f8b0a5
size 23229

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4758cbf83f0e7b762ea51e9bbc6c05ad5c717a0a774415ec3df23e99a312dfef
size 2598

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:937c3e6d20549e353f8114f59e182601a10ff6e4a9a92e6c0a326f7282598cbf
size 40793

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8534e1ae5fe924b6dd39ff4574d83fd6543daf1801f43107d0bdc0a65d6eacf0
size 17373

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0eec47cdb410022d115b454ee1b4c2df1466753b713cc5964baacd25ee01447f
size 6568

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e092d2fdee84668b5a65faca69cf1be065edc05861098d77725b534fa29c8f3
size 893

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Jan 28 11:40:16 PST 2014 - lduncan@suse.com
- Replaced 8 patches with one, to clean up. Added patch:
open-iscsi-Factory-latest.diff.bz2
Removed patches:
open-iscsi-openSUSE-12.3-first-merge.diff.bz2
open-iscsi-openSUSE-Factory-first-merge.diff.bz2
open-iscsi-openSUSE-Factory-qla4xxx-patches.diff.bz2
open-iscsi-sles11-sp2-latest.diff.bz2
open-iscsi-sles11-sp2-update.diff.bz2
open-iscsi-sles11-sp3-flash-update.diff.bz2
open-iscsi-sles11-sp3-general-updates-1.diff.bz2
open-iscsi-sles11-sp3-iscsiuio-update.diff.bz2
No functional changes.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 9 10:11:32 PST 2014 - lduncan@suse.com Thu Jan 9 10:11:32 PST 2014 - lduncan@suse.com

View File

@ -36,14 +36,7 @@ Summary: Linux* Open-iSCSI Software Initiator
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Networking/Other Group: Productivity/Networking/Other
Source: %{name}-2.0-%{iscsi_release}.tar.bz2 Source: %{name}-2.0-%{iscsi_release}.tar.bz2
Patch1: %{name}-sles11-sp2-update.diff.bz2 Patch1: %{name}-Factory-latest.diff.bz2
Patch2: %{name}-sles11-sp2-latest.diff.bz2
Patch3: %{name}-sles11-sp3-iscsiuio-update.diff.bz2
Patch4: %{name}-sles11-sp3-flash-update.diff.bz2
Patch5: %{name}-sles11-sp3-general-updates-1.diff.bz2
Patch6: %{name}-openSUSE-12.3-first-merge.diff.bz2
Patch7: %{name}-openSUSE-Factory-first-merge.diff.bz2
Patch8: %{name}-openSUSE-Factory-qla4xxx-patches.diff.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -74,13 +67,6 @@ Authors:
%prep %prep
%setup -n %{name}-2.0-%{iscsi_release} %setup -n %{name}-2.0-%{iscsi_release}
%patch1 -p1 %patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build %build
%{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DLOCK_DIR=\\\"/etc/iscsi\\\"" user %{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DLOCK_DIR=\\\"/etc/iscsi\\\"" user