File project.diff of Package android-tools

--- android-tools.changes.orig
+++ android-tools.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Oct  6 07:10:34 UTC 2025 - munix9@googlemail.com
+
+- Remove 'go' as a build requirement (only needed eg. for the
+  boringssl test suite)
+- Merge bash-completion into main package (consolidation)
+
+-------------------------------------------------------------------
 Tue Jul 22 10:20:58 UTC 2025 - munix9@googlemail.com
 
 - Add fix-libusb-enumeration.patch
--- android-tools.spec.orig
+++ android-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package android-tools
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,6 @@ Patch1:         fix-protobuf-30-compat.p
 # PATCH-FIX-UPSTREAM fix-libusb-enumeration.patch gh#nmeum/android-tools#153
 Patch2:         fix-libusb-enumeration.patch
 BuildRequires:  cmake >= 3.12
-BuildRequires:  go
 BuildRequires:  llvm-gold
 BuildRequires:  ninja
 BuildRequires:  pkgconfig
@@ -51,9 +50,11 @@ BuildRequires:  pkgconfig(libunwind-gene
 BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(protobuf) >= 21
 BuildRequires:  pkgconfig(zlib)
-Suggests:       %{name}-mkbootimg = %{version}
-Suggests:       %{name}-partition = %{version}
+Suggests:       %{name}-mkbootimg
+Suggests:       %{name}-partition
 Suggests:       android-udev-rules
+Provides:       %{name}-bash-completion = %{version}-%{release}
+Obsoletes:      %{name}-bash-completion < %{version}-%{release}
 Provides:       %{name}-python3 = %{version}-%{release}
 Obsoletes:      %{name}-python3 < %{version}-%{release}
 Provides:       bundled(boringssl)
@@ -97,22 +98,11 @@ Requires:       %{name} = %{version}
 %description partition
 This package contains the Android dynamic partition tools.
 
-%package bash-completion
-Summary:        Bash completion for android-tools
-BuildRequires:  bash-completion
-Requires:       bash-completion
-Supplements:    (%{name} and bash-completion)
-BuildArch:      noarch
-
-%description bash-completion
-Bash command line completion support for android-tools.
-
 %prep
 %autosetup -p1
 
 %build
 %define __builder ninja
-export GOFLAGS="-buildmode=pie -trimpath -ldflags=-buildid="
 
 %cmake \
 %if 0%{?suse_version} < 1600
@@ -180,6 +170,14 @@ mkbootimg --help
 %{_bindir}/mke2fs.android
 %{_bindir}/simg2img
 %{_bindir}/sload_f2fs
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%if 0%{?suse_version} < 1600
+%exclude %{_datadir}/bash-completion/completions/adb
+%else
+%{_datadir}/bash-completion/completions/adb
+%endif
+%{_datadir}/bash-completion/completions/fastboot
 %{_mandir}/man1/adb.1%{?ext_man}
 
 %files mkbootimg
@@ -194,12 +192,4 @@ mkbootimg --help
 %doc vendor/extras/partition_tools/README.md
 %{_bindir}/lp{add,dump,flash,make,unpack}
 
-%files bash-completion
-%if 0%{?suse_version} < 1600
-%exclude %{_datadir}/bash-completion/completions/adb
-%else
-%{_datadir}/bash-completion/completions/adb
-%endif
-%{_datadir}/bash-completion/completions/fastboot
-
 %changelog