Accepting request 1183443 from filesystems

OBS-URL: https://build.opensuse.org/request/show/1183443
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=158

btrfsprogs.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 21 13:19:59 UTC 2024 - Dominik Heidler <dheidler@suse.de>
+
+- Let btrfsprogs-bash-completion require btrfsprogs with same version
+  as there is a file conflict with the bash completion scripts
+  still being bundled with btrfsprogs in older versions shipped with 15.6
+
 -------------------------------------------------------------------
 Wed Jun 19 00:00:00 CEST 2024 - dsterba@suse.cz
 

btrfsprogs.spec

@@ -84,7 +84,7 @@ BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(udev)
 %if 0%{?suse_version} >= 1310
 Requires(post): coreutils
-Requires(postun):coreutils
+Requires(postun): coreutils
 %endif
 Supplements:    filesystem(btrfs)
 Recommends:     btrfsmaintenance
@@ -192,12 +192,11 @@ with Btrfs using libbtrfsutil.
 %package bash-completion
 Summary:        Bash completion for btrfsprogs
 Group:          System/Shells
-Requires:       %{name}
+# older versions had bash completion files builtin and will create a file conflict
+Requires:       %{name} = %{version}
 Requires:       bash-completion
-# versions below 6.2.1 had bash completion files builtin and will create a file conflict
-Conflicts:      %{name} <= 6.2.1
 %if 0%{?suse_version} >= 1500
-Supplements:    (%{name} and bash-completion)
+Supplements:    (%{name} = %{version} and bash-completion)
 %else
 Supplements:    packageand(%{name}:bash-completion)
 %endif