From 957afd7b2907b6eedf87effacf91a25119a61a9026fc9bfc62b9c63ef140732c Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 4 Jan 2022 11:48:10 +0000 Subject: [PATCH 1/3] - Update to version 1.47+2.388b767: * rescan-scsi-bus.sh: apply fix for '-r' (boo#1194293) OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=91 --- _service | 4 ++-- _servicedata | 4 +++- sg3_utils-1.47+2.388b767.obscpio | 3 +++ sg3_utils-1.47.obscpio | 3 --- sg3_utils-1.47.tar.gz | 3 +++ sg3_utils.changes | 6 ++++++ sg3_utils.obsinfo | 7 +++---- sg3_utils.spec | 4 ++-- 8 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 sg3_utils-1.47+2.388b767.obscpio delete mode 100644 sg3_utils-1.47.obscpio create mode 100644 sg3_utils-1.47.tar.gz diff --git a/_service b/_service index c92d97b..1d61bbd 100644 --- a/_service +++ b/_service @@ -1,13 +1,13 @@ git - https://github.com/doug-gilbert/sg3_utils + https://github.com/openSUSE/sg3_utils sg3_utils @PARENT_TAG@+@TAG_OFFSET@.%h r[0-9]\.[0-9]* r([^+]*)(\+[1-9\..*])?(\+0\..*)? \1\2 - master + factory enable diff --git a/_servicedata b/_servicedata index ce96222..147ddc8 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,6 @@ https://github.com/openSUSE/sg3_utils.git 6aa67ed94a6c135d6a462c55b3764732259b162e https://github.com/doug-gilbert/sg3_utils - ed556a52933d29309849dbb24ba49f8b829c1058 \ No newline at end of file + ed556a52933d29309849dbb24ba49f8b829c1058 + https://github.com/openSUSE/sg3_utils + 388b7673ddb5f106a4420a50a764932b3e4082c9 \ No newline at end of file diff --git a/sg3_utils-1.47+2.388b767.obscpio b/sg3_utils-1.47+2.388b767.obscpio new file mode 100644 index 0000000..55c6fe5 --- /dev/null +++ b/sg3_utils-1.47+2.388b767.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe10244f2721c5caacdfd90b6b4d62a4ce33d9f637e0ae3a4e585264d0aba09f +size 7376909 diff --git a/sg3_utils-1.47.obscpio b/sg3_utils-1.47.obscpio deleted file mode 100644 index 5d2ec51..0000000 --- a/sg3_utils-1.47.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcc4cf10ac5c91f95006c2384a9a76e25a0561c4aa6222bb909fdc65f5ba4af4 -size 7372301 diff --git a/sg3_utils-1.47.tar.gz b/sg3_utils-1.47.tar.gz new file mode 100644 index 0000000..9f68ada --- /dev/null +++ b/sg3_utils-1.47.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8673c7faca849b6b34764332d2aa91f72db05bff7382bb836d0688795199c3e1 +size 1682084 diff --git a/sg3_utils.changes b/sg3_utils.changes index 1265236..7c9cee0 100644 --- a/sg3_utils.changes +++ b/sg3_utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 04 11:47:02 UTC 2022 - mwilck@suse.com + +- Update to version 1.47+2.388b767: + * rescan-scsi-bus.sh: apply fix for '-r' (boo#1194293) + ------------------------------------------------------------------- Thu Nov 11 21:15:17 UTC 2021 - mwilck@suse.com diff --git a/sg3_utils.obsinfo b/sg3_utils.obsinfo index 38f0974..281dc22 100644 --- a/sg3_utils.obsinfo +++ b/sg3_utils.obsinfo @@ -1,5 +1,4 @@ name: sg3_utils -version: 1.47 -mtime: 1636576643 -commit: ed556a52933d29309849dbb24ba49f8b829c1058 - +version: 1.47+2.388b767 +mtime: 1641296136 +commit: 388b7673ddb5f106a4420a50a764932b3e4082c9 diff --git a/sg3_utils.spec b/sg3_utils.spec index 9a33748..f668724 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -1,7 +1,7 @@ # # spec file for package sg3_utils # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: sg3_utils -Version: 1.47 +Version: 1.47+2.388b767 %global lname libsgutils2-%(echo %{version} | sed y/./_/)-2 Release: 0 Summary: A collection of tools that send SCSI commands to devices From 1804eb01cac61ecbaddfd38708ea146b0d13b0bfb66f5d744bb7cf074917c429 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 4 Jan 2022 12:08:29 +0000 Subject: [PATCH 2/3] * _service: use openSUSE github repo again (with cherry-picks from upstream) * spec file: suppress commit ID in library version OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=92 --- sg3_utils.changes | 3 +++ sg3_utils.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sg3_utils.changes b/sg3_utils.changes index 7c9cee0..87e97c9 100644 --- a/sg3_utils.changes +++ b/sg3_utils.changes @@ -3,6 +3,9 @@ Tue Jan 04 11:47:02 UTC 2022 - mwilck@suse.com - Update to version 1.47+2.388b767: * rescan-scsi-bus.sh: apply fix for '-r' (boo#1194293) + * _service: use openSUSE github repo again (with cherry-picks + from upstream) + * spec file: suppress commit ID in library version ------------------------------------------------------------------- Thu Nov 11 21:15:17 UTC 2021 - mwilck@suse.com diff --git a/sg3_utils.spec b/sg3_utils.spec index f668724..872c419 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -18,7 +18,7 @@ Name: sg3_utils Version: 1.47+2.388b767 -%global lname libsgutils2-%(echo %{version} | sed y/./_/)-2 +%global lname libsgutils2-%(echo %{version} | sed 'y/./_/;s/+.*//')-2 Release: 0 Summary: A collection of tools that send SCSI commands to devices License: BSD-3-Clause AND GPL-2.0-or-later From a637c4622f000ca24e5125669ca4954a2b796fd6d5a76e631edfb9117cd22edb Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 4 Jan 2022 12:15:40 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=93 --- sg3_utils-1.47.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 sg3_utils-1.47.tar.gz diff --git a/sg3_utils-1.47.tar.gz b/sg3_utils-1.47.tar.gz deleted file mode 100644 index 9f68ada..0000000 --- a/sg3_utils-1.47.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8673c7faca849b6b34764332d2aa91f72db05bff7382bb836d0688795199c3e1 -size 1682084