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-11-13 15:29:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/android-tools (Old)
and /work/SRC/openSUSE:Factory/.android-tools.new.2017 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "android-tools"
Wed Nov 13 15:29:14 2024 rev:22 rq:1223843 version:35.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes
2024-10-23 21:11:48.466520725 +0200
+++ /work/SRC/openSUSE:Factory/.android-tools.new.2017/android-tools.changes
2024-11-13 15:29:43.748890841 +0100
@@ -1,0 +2,8 @@
+Tue Nov 5 05:16:45 UTC 2024 - mun...@googlemail.com
+
+- Exclude ppc ppc64 and ppc64le: Bundled boringssl doesn't support
+ the big endian architectures and dropped ppc64le support
+- Simplify python3 requirements
+- Simplify fix-install-completion.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ android-tools.spec ++++++
--- /var/tmp/diff_new_pack.dhEhkd/_old 2024-11-13 15:29:45.280954835 +0100
+++ /var/tmp/diff_new_pack.dhEhkd/_new 2024-11-13 15:29:45.292955336 +0100
@@ -16,11 +16,6 @@
#
-%if 0%{?suse_version} < 1600
-%define _pyver 311
-%else
-%define _pyver 3
-%endif
%if 0%{?suse_version} <= 1600
%bcond_without bundled_libfmt
%else
@@ -44,7 +39,6 @@
BuildRequires: llvm-gold
BuildRequires: ninja
BuildRequires: pkgconfig
-BuildRequires: python%{_pyver}
BuildRequires: pkgconfig(gtest)
BuildRequires: pkgconfig(libbrotlicommon)
BuildRequires: pkgconfig(liblz4)
@@ -59,12 +53,14 @@
Provides: %{name}-python3 = %{version}-%{release}
Obsoletes: %{name}-python3 < %{version}-%{release}
Provides: bundled(boringssl)
-ExcludeArch: s390x
+ExcludeArch: ppc ppc64 ppc64le s390x
%if 0%{?suse_version} < 1600
BuildRequires: clang15
BuildRequires: gcc11-c++
+BuildRequires: python311
%else
BuildRequires: clang
+BuildRequires: python3
%endif
%if %{with bundled_libfmt}
Provides: bundled(fmt) = 10.2.0
@@ -145,12 +141,12 @@
# fix non-executable-script
chmod 0755
%{buildroot}%{_datadir}/%{name}/mkbootimg/gki/generate_gki_certificate.py
-# fix env-script-interpreter (Leap requires special handling)
+# fix env-script-interpreter (Leap < 16.0 requires special handling)
%if 0%{?suse_version} < 1600
%define
python3_fix_shebang_path(+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-=)
\
myargs="%{**}" \
for f in ${myargs}; do \
- [ -f $f ] && sed -i "1s@#\\!.*python.*@#\\!$(realpath
%{expand:%{__python%{_pyver}}})@" $f \
+ [ -f $f ] && sed -i "1s@#\\!.*python.*@#\\!$(realpath %{__python311})@" $f \
done
%endif
%python3_fix_shebang_path %{buildroot}%{_bindir}/*
++++++ fix-install-completion.patch ++++++
--- /var/tmp/diff_new_pack.dhEhkd/_old 2024-11-13 15:29:45.644970039 +0100
+++ /var/tmp/diff_new_pack.dhEhkd/_new 2024-11-13 15:29:45.700972379 +0100
@@ -14,80 +14,29 @@
diff -ruN a/vendor/adb/adb.bash b/vendor/adb/adb.bash
--- a/vendor/adb/adb.bash
+++ b/vendor/adb/adb.bash
-@@ -16,11 +16,11 @@
+@@ -15,6 +15,10 @@
+ # limitations under the License.
#
++check_type() {
++ type -t "$1"
++}
++
_adb() {
-- if ! check_type "$1" >/dev/null; then
-+ if ! type -t "$1" >/dev/null; then
+ if ! check_type "$1" >/dev/null; then
return
- fi
-
-- if check_type _init_completion >/dev/null; then
-+ if type -t _init_completion >/dev/null; then
- _init_completion || return
- fi
-
-@@ -455,7 +455,7 @@
- fi
-
- # Since we're probably doing file completion here, don't add a space
after.
-- if [[ $(check_type compopt) == "builtin" ]]; then
-+ if [[ $(type -t compopt) == "builtin" ]]; then
- compopt -o nospace
- fi
-
-@@ -471,7 +471,7 @@
- xspec=$2
-
- # Since we're probably doing file completion here, don't add a space
after.
-- if [[ $(check_type compopt) == "builtin" ]]; then
-+ if [[ $(type -t compopt) == "builtin" ]]; then
- compopt -o plusdirs
- if [[ "${xspec}" == "" ]]; then
- COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -f -- "${cur}") )
-@@ -512,7 +512,7 @@
- }
-
-
--if [[ $(check_type compopt) == "builtin" ]]; then
-+if [[ $(type -t compopt) == "builtin" ]]; then
- complete -F _adb adb
- else
- complete -o nospace -F _adb adb
diff -ruN a/vendor/core/fastboot/fastboot.bash
b/vendor/core/fastboot/fastboot.bash
--- a/vendor/core/fastboot/fastboot.bash
+++ b/vendor/core/fastboot/fastboot.bash
-@@ -16,11 +16,11 @@
+@@ -15,6 +15,10 @@
+ # limitations under the License.
#
++check_type() {
++ type -t "$1"
++}
++
_fastboot() {
-- if ! check_type "$1" >/dev/null; then
-+ if ! type -t "$1" >/dev/null; then
+ if ! check_type "$1" >/dev/null; then
return
- fi
-
-- if check_type _init_completion >/dev/null; then
-+ if type -t _init_completion >/dev/null; then
- _init_completion || return
- fi
-
-@@ -135,7 +135,7 @@
- xspec=$2
-
- # Since we're probably doing file completion here, don't add a space
after.
-- if [[ $(check_type compopt) == "builtin" ]]; then
-+ if [[ $(type -t compopt) == "builtin" ]]; then
- compopt -o plusdirs
- if [[ "${xspec}" == "" ]]; then
- COMPREPLY=( ${COMPREPLY[@]:-} $(compgen -f -- "${cur}") )
-@@ -175,7 +175,7 @@
- fi
- }
-
--if [[ $(check_type compopt) == "builtin" ]]; then
-+if [[ $(type -t compopt) == "builtin" ]]; then
- complete -F _fastboot fastboot
- else
- complete -o nospace -F _fastboot fastboot
