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.changes b/sg3_utils.changes index 1265236..87e97c9 100644 --- a/sg3_utils.changes +++ b/sg3_utils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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.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..872c419 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,8 +17,8 @@ Name: sg3_utils -Version: 1.47 -%global lname libsgutils2-%(echo %{version} | sed y/./_/)-2 +Version: 1.47+2.388b767 +%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