diff --git a/_service b/_service
index 314ff4b..c243ec5 100644
--- a/_service
+++ b/_service
@@ -4,11 +4,16 @@
https://github.com/openSUSE/sg3_utils
sg3_utils
@PARENT_TAG@+@TAG_OFFSET@.%h
- [0-9].[0-9]*.pre.[0-9]*
- ([0-9.]+)\.pre\.([0-9]+)(\+[1-9])?(\+0)?(\.[a-f0-9]+)
- \1~\2\3\5
+
+ release-([0-9].[0-9]+)
+ \1
factory
- enable
+ disable
diff --git a/dracut.conf b/dracut.conf
index 9f0b0d3..69c78f1 100644
--- a/dracut.conf
+++ b/dracut.conf
@@ -1,2 +1,3 @@
# Add new rules file to ensure consistency
-install_items+=" /usr/lib/udev/rules.d/54-before-scsi-sg3_id.rules "
+install_items+=" /usr/lib/udev/rules.d/54-before-scsi-sg3_id.rules /usr/lib/udev/rules.d/00-scsi-sg3_config.rules "
+install_optional_items+=" /etc/udev/rules.d/00-scsi-sg3_config.rules "
diff --git a/sg3_utils-1.48+1.889c3e3.obscpio b/sg3_utils-1.48+1.889c3e3.obscpio
new file mode 100644
index 0000000..978e384
--- /dev/null
+++ b/sg3_utils-1.48+1.889c3e3.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbc932c1eac4783d7f4f7cd104bd9f9cd35123376caf261362556b42f4e75f05
+size 7006221
diff --git a/sg3_utils-1.48~20221101+1.142dace.obscpio b/sg3_utils-1.48~20221101+1.142dace.obscpio
deleted file mode 100644
index 67e30f9..0000000
--- a/sg3_utils-1.48~20221101+1.142dace.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8fa689b468b42587388f6d0b5685a01884aca39eb6f705dfdd1a140fe2630e1
-size 7976973
diff --git a/sg3_utils.changes b/sg3_utils.changes
index 51f3d16..8e835e6 100644
--- a/sg3_utils.changes
+++ b/sg3_utils.changes
@@ -1,3 +1,49 @@
+-------------------------------------------------------------------
+Thu Sep 28 13:34:30 UTC 2023 - Martin Wilck
+
+- udev rules: allow kernel command line overrides with
+ "udev.scsi_id_serial_src=LTVS" and "udev.scsi_symlink_src=LTVS"
+ Try these boot parameters if your system fails to detect SCSI
+ devices after update to sg3_utils 1.48.
+
+-------------------------------------------------------------------
+Wed Sep 27 15:56:57 UTC 2023 - Martin Wilck
+
+- dracut.conf: add 00-scsi-sg3_config.rules (jsc#PED-6226)
+- spec file:
+ * fix build dependencies for regenerate_initrd_posttrans
+ (bsc#1215772)
+ * add missing rules file
+
+-------------------------------------------------------------------
+Thu Sep 21 20:17:46 UTC 2023 - Martin Wilck
+
+- Update to version 1.48
+ * udev rules: new, configurable scheme for creating symlinks for SCSI devices
+ (jsc#PED-6226)
+ See description of ".SCSI_ID_SERIAL_SRC" /usr/lib/udev/55-scsi-sg3_id.rules
+ and .SCSI_SYMLINK_SRC in /usr/lib/udev/58-scsi_symlink.rules
+ * decoding utilities: add -j/--json[=JO] and --js-file=JFN options
+ * sg_sat_datetime: new tool to access date/time on ATA devices using a SAT layer
+ * sg_z_act_query: new tool for sending zone activate/query commands
+ * sg_rem_rest_elem: new tool for removing or restoring elements
+ * sg_write_attr: support for SPC "Write Attirbute" command (for tapes)
+ * sg_ses: swap meaning of -H and -HH, add json support, use e.g.
+ "0:2" for range indicator
+ * sg_rtpg: fix response truncation
+ * sg_decode_sense: add --nodecode option
+ * sg_logs: fix --list and -lll options
+ * sg_modes: improve handling of ZBC disks
+ * sg_inq: add version descriptors from SPC6r08, add --quiet option
+ * sg_vpd: add --sinq_inraw=RFN option
+ * sg_turs: add --timeout= and --ascq= options
+ * sg_requests: add --timeout= option
+ * sg_sat_read_gplog: add --smart and --ppt options
+ * sgp_dd and sgm_dd: add --progress option
+ * sg_dd: add support for accessing NVMe devices via passthrough
+ * Bug fixes and minor fixes
+- _service: simplify version processing, as we have a clean upstream version again
+
-------------------------------------------------------------------
Fri Jan 27 15:45:58 UTC 2023 - Martin Wilck
@@ -9,7 +55,8 @@ Thu Nov 03 20:15:14 UTC 2022 - mwilck@suse.com
- Update to new upstream version 1.48~20221101.6d3bd26:
(pre-release sg3_utils-1.48 [20221101] [svn: r978])
- * sg_read_block_limits: fix granularity value, add --mloi option; sg_lib: add sg_ll_read_block_limits_v2(); sg_logs: json work
+ * sg_read_block_limits: fix granularity value, add --mloi option
+ * sg_lib: add sg_ll_read_block_limits_v2(); sg_logs: json work
* sg_stream_ctl: --get fix better; sg_rem_rest_elem: cleanup
* sg_stream_ctl: fix --get indexing; fix some './configure --enable-debug' issues
* sg_inq+sg_vpd: JSON updates
diff --git a/sg3_utils.obsinfo b/sg3_utils.obsinfo
index a296506..5b1c78a 100644
--- a/sg3_utils.obsinfo
+++ b/sg3_utils.obsinfo
@@ -1,4 +1,4 @@
name: sg3_utils
-version: 1.48~20221101+1.142dace
-mtime: 1674833433
-commit: 142dace4f41db6369a73a19d8434c26ff7986b01
+version: 1.48+1.889c3e3
+mtime: 1695906255
+commit: 889c3e31fc50f6f2cca51455ee157caaa20da17f
diff --git a/sg3_utils.spec b/sg3_utils.spec
index 024054e..ccda0c2 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -17,7 +17,7 @@
Name: sg3_utils
-Version: 1.48~20221101+1.142dace
+Version: 1.48+1.889c3e3
%global lname libsgutils2-%(echo %{version} | sed 's/[~+].*//;y/./_/')-2
Release: 0
Summary: A collection of tools that send SCSI commands to devices
@@ -37,6 +37,12 @@ Supplements: modalias(scsi:t-0x00*)
Supplements: modalias(scsi:t-0x07*)
Supplements: modalias(scsi:t-0x0e*)
Obsoletes: scsi <= 1.7_2.38_1.25_0.19_1.02_0.93
+# For regenerate_initrd_posttrans
+%if 0%{?suse_version} < 1550
+BuildRequires: suse-module-tools
+%else
+BuildRequires: rpm-config-SUSE
+%endif
%description
The sg3_utils package contains utilities that send SCSI commands to
@@ -94,10 +100,11 @@ make %{?_smp_mflags}
%make_install
install -m 644 doc/rescan-scsi-bus.sh.8 %{buildroot}/%{_mandir}/man8
mkdir -p %{buildroot}/%{_udevrulesdir}
+install -m 644 scripts/00-scsi-sg3_config.rules %{buildroot}/%{_udevrulesdir}
+install -m 644 scripts/40-usb-blacklist.rules %{buildroot}/%{_udevrulesdir}
install -m 644 scripts/54-before-scsi-sg3_id.rules %{buildroot}/%{_udevrulesdir}
install -m 644 scripts/55-scsi-sg3_id.rules %{buildroot}/%{_udevrulesdir}
install -m 644 scripts/58-scsi-sg3_symlink.rules %{buildroot}/%{_udevrulesdir}
-install -m 644 scripts/40-usb-blacklist.rules %{buildroot}/%{_udevrulesdir}
install -m 644 scripts/59-fc-wwpn-id.rules %{buildroot}/%{_udevrulesdir}
install -m 755 scripts/fc_wwpn_id %{buildroot}/%{_udevrulesdir}/..
mkdir -p %{buildroot}/usr/lib/dracut/dracut.conf.d
@@ -141,6 +148,7 @@ rm -f %{buildroot}%{_libdir}/*.la
%_mandir/man8/*.8*
%dir /usr/lib/udev
%dir %{_udevrulesdir}
+%{_udevrulesdir}/00-scsi-sg3_config.rules
%{_udevrulesdir}/40-usb-blacklist.rules
%{_udevrulesdir}/54-before-scsi-sg3_id.rules
%{_udevrulesdir}/55-scsi-sg3_id.rules