Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package android-tools for openSUSE:Factory checked in at 2024-10-23 21:10:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/android-tools (Old) and /work/SRC/openSUSE:Factory/.android-tools.new.26871 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "android-tools" Wed Oct 23 21:10:34 2024 rev:21 rq:1217137 version:35.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes 2024-09-06 17:19:02.313121802 +0200 +++ /work/SRC/openSUSE:Factory/.android-tools.new.26871/android-tools.changes 2024-10-23 21:11:48.466520725 +0200 @@ -1,0 +2,15 @@ +Sun Oct 20 11:48:59 UTC 2024 - munix9@googlemail.com + +- Fix build for Leap 16.0 +- Add 'Provides: bundled(...)' where appropriate +- Clean up spec file + +------------------------------------------------------------------- +Sun Sep 22 22:22:22 UTC 2024 - olaf@aepfle.de + +- remove adb from bash-completion package for SLE15 because it is + still part of bash-completion itself +- Use specific python versions for all SLE15 variants +- Require protobuf >= 21 until earlier variants are supported again + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ android-tools.spec ++++++ --- /var/tmp/diff_new_pack.wpyST7/_old 2024-10-23 21:11:49.154549448 +0200 +++ /var/tmp/diff_new_pack.wpyST7/_new 2024-10-23 21:11:49.158549615 +0200 @@ -16,20 +16,19 @@ # -%define _pyver 3 -%if 0%{?sle_version} == 150500 || 0%{?sle_version} == 150600 +%if 0%{?suse_version} < 1600 %define _pyver 311 +%else +%define _pyver 3 %endif -%if 0%{?sle_version} == 150400 -%define _pyver 310 -%endif - -%if 0%{?suse_version} < 1600 -%define use_bundled_libfmt 1 +%if 0%{?suse_version} <= 1600 +%bcond_without bundled_libfmt +%else +%bcond_with bundled_libfmt %endif -# currently libusb with support for SuperSpeed+ is required, +# currently libusb with support for SuperSpeedPlus is required, # which is not yet released, so the one bundled is used. -%define use_bundled_libusb 1 +%bcond_without bundled_libusb Name: android-tools Version: 35.0.2 @@ -52,13 +51,14 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libunwind-generic) BuildRequires: pkgconfig(libzstd) -BuildRequires: pkgconfig(protobuf) +BuildRequires: pkgconfig(protobuf) >= 21 BuildRequires: pkgconfig(zlib) Requires: android-udev-rules Suggests: %{name}-mkbootimg = %{version} Suggests: %{name}-partition = %{version} Provides: %{name}-python3 = %{version}-%{release} Obsoletes: %{name}-python3 < %{version}-%{release} +Provides: bundled(boringssl) ExcludeArch: s390x %if 0%{?suse_version} < 1600 BuildRequires: clang15 @@ -66,13 +66,16 @@ %else BuildRequires: clang %endif -%if %{undefined use_bundled_libfmt} +%if %{with bundled_libfmt} +Provides: bundled(fmt) = 10.2.0 +%else BuildRequires: pkgconfig(fmt) >= 10.2.0 %endif -%if %{undefined use_bundled_libusb} -BuildRequires: pkgconfig(libusb-1.0) -%else +%if %{with bundled_libusb} BuildRequires: pkgconfig(libudev) +Provides: bundled(libusb-1_0) +%else +BuildRequires: pkgconfig(libusb-1.0) %endif %description @@ -111,27 +114,24 @@ %define __builder ninja export GOFLAGS="-buildmode=pie -trimpath -ldflags=-buildid=" +%cmake \ %if 0%{?suse_version} < 1600 -CMAKE_C_COMPILER=clang-15 -CMAKE_CXX_COMPILER=clang++-15 + -DCMAKE_C_COMPILER=clang-15 \ + -DCMAKE_CXX_COMPILER=clang++-15 \ %else -CMAKE_C_COMPILER=clang -CMAKE_CXX_COMPILER=clang++ + -DCMAKE_C_COMPILER=clang \ + -DCMAKE_CXX_COMPILER=clang++ \ %endif - -%cmake \ - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} \ - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} \ -%if %{defined use_bundled_libfmt} +%ifarch %{ix86} + -DOPENSSL_NO_ASM=ON \ +%endif +%if %{with bundled_libfmt} -DANDROID_TOOLS_USE_BUNDLED_FMT=ON \ %endif -%if %{defined use_bundled_libusb} +%if %{with bundled_libusb} -DANDROID_TOOLS_USE_BUNDLED_LIBUSB=ON \ -DANDROID_TOOLS_LIBUSB_ENABLE_UDEV=ON \ %endif -%ifarch %{ix86} - -DOPENSSL_NO_ASM=ON \ -%endif -DBUILD_SHARED_LIBS=OFF %cmake_build @@ -195,6 +195,10 @@ %{_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