From 2ad8e066b3e0c1a12badf558ec97a0aaf8af2d46c3a7a2f52fbffabf7141c43f Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Mon, 25 Dec 2023 22:18:03 +0000 Subject: [PATCH] Accepting request 1134519 from home:lee_duncan:branches:network - Updated to latest upstream: two small changes, with no known functional changes: * Incorrect documentation for `iscsiadm -m session` print level (upstream issue #432) * Stop using deprecated inet_aton and inet_ntoa (upstream issue #435) - Also, stopped using pre-prepared tarballs for the build, instead now using a service file to get latest SUSE srouces directly. This removed these two files: * open-iscsi-2.1.9-suse.tar.bz2, and * open-iscsi-SUSE-latest.diff.bz2 whcih were both created by a shell script, and added a service- file-generated file of the form: * open-iscsi-2.1.9.suse+TAG_OFFSET.tar.xz where TAG_OFFSET is of the form "COMMIT_COUNT.HASH", where COMMIT_COUNT is the count of commits since 2.1.9-suse (in this case), and HASH is the git commit hash being used. OBS-URL: https://build.opensuse.org/request/show/1134519 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=235 --- _service | 17 +++++++++++++++ _servicedata | 4 ++++ open-iscsi-2.1.9-suse.tar.bz2 | 3 --- open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz | 3 +++ open-iscsi-SUSE-latest.diff.bz2 | 3 --- open-iscsi.changes | 21 +++++++++++++++++++ open-iscsi.spec | 9 ++++---- 7 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 _service create mode 100644 _servicedata delete mode 100644 open-iscsi-2.1.9-suse.tar.bz2 create mode 100644 open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz delete mode 100644 open-iscsi-SUSE-latest.diff.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..88966eb --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + https://github.com/openSUSE/open-iscsi.git + git + open-iscsi + d557967bc9ae + 2.1.9.suse+@TAG_OFFSET@.%h + 2.1.[0-9] + openSUSE-Factory + enable + .git + + + open-iscsi*.tar + xz + + diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..323cc41 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/openSUSE/open-iscsi.git + d557967bc9aeaa9aa4f62b443c0aec48a8e8e046 \ No newline at end of file diff --git a/open-iscsi-2.1.9-suse.tar.bz2 b/open-iscsi-2.1.9-suse.tar.bz2 deleted file mode 100644 index 755b726..0000000 --- a/open-iscsi-2.1.9-suse.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51cf293e35e6b32329f736412497bfbbad517a39ebc60b507621c41b0ba68a19 -size 513594 diff --git a/open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz b/open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz new file mode 100644 index 0000000..af47b84 --- /dev/null +++ b/open-iscsi-2.1.9.suse+844.d557967bc9ae.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e3d82c4285c1b85bfe1c118bf235cbeb34286bc17d209827eb3812667d8bfd1 +size 491536 diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2 deleted file mode 100644 index 7f224a9..0000000 --- a/open-iscsi-SUSE-latest.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:725d474a202929eae4b29c22360431b3d1042404e5707ebc1e50f7ff1b6e44c0 -size 38592 diff --git a/open-iscsi.changes b/open-iscsi.changes index bd55991..3b5ecf0 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Dec 20 18:39:01 UTC 2023 - Lee Duncan + +- Updated to latest upstream: two small changes, with no known + functional changes: + * Incorrect documentation for `iscsiadm -m session` print level + (upstream issue #432) + * Stop using deprecated inet_aton and inet_ntoa (upstream issue + #435) +- Also, stopped using pre-prepared tarballs for the build, instead + now using a service file to get latest SUSE srouces directly. + This removed these two files: + * open-iscsi-2.1.9-suse.tar.bz2, and + * open-iscsi-SUSE-latest.diff.bz2 + whcih were both created by a shell script, and added a service- + file-generated file of the form: + * open-iscsi-2.1.9.suse+TAG_OFFSET.tar.xz + where TAG_OFFSET is of the form "COMMIT_COUNT.HASH", where + COMMIT_COUNT is the count of commits since 2.1.9-suse (in this + case), and HASH is the git commit hash being used. + ------------------------------------------------------------------- Wed Oct 25 18:48:01 UTC 2023 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index 40a6771..dbc6fc2 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -47,7 +47,8 @@ %define iscsi_minor_release 1 %define iscsi_patch_release 9 -%define iscsi_patch_release_suse %{iscsi_patch_release}-suse +%define iscsi_patch_release_suse %{iscsi_patch_release}.suse +%define iscsi_service_tag 844.d557967bc9ae %define libname libopeniscsiusr0 %define libversion 0.2.0 Name: open-iscsi @@ -57,8 +58,7 @@ Summary: Linux iSCSI Software Initiator License: GPL-2.0-or-later Group: Productivity/Networking/Other URL: https://www.open-iscsi.com -Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}.tar.bz2 -Patch1: %{name}-SUSE-latest.diff.bz2 +Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}+%{iscsi_service_tag}.tar.xz BuildRequires: bison BuildRequires: db-devel < 5 BuildRequires: fdupes @@ -142,8 +142,7 @@ include files and documentation. These are used to compile against the libopeniscsiusr library. %prep -%setup -q -n %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse} -%patch1 -p1 +%setup -q -n %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}+%{iscsi_service_tag} %build [ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH