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 2022-11-08 10:54:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/android-tools (Old)
and /work/SRC/openSUSE:Factory/.android-tools.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "android-tools"
Tue Nov 8 10:54:59 2022 rev:8 rq:1034389 version:33.0.3p1
Changes:
--------
--- /work/SRC/openSUSE:Factory/android-tools/android-tools.changes
2022-10-17 14:57:54.938117598 +0200
+++ /work/SRC/openSUSE:Factory/.android-tools.new.1597/android-tools.changes
2022-11-08 10:55:32.001851534 +0100
@@ -1,0 +2,12 @@
+Sat Nov 5 09:36:17 UTC 2022 - mun...@googlemail.com
+
+- Update to version 33.0.3p1
+ * Fixed mkbootimg (see #78)
+ * Added avbtool (see #79)
+ * Fix for compatibility with Linux >= 6.0 (see #74)
+ * Removal of several obsolete patches
+
+- Remove fix-mkbootimg-gki-path.patch (fixed upstream)
+- Remove fix-lpmake-help-segfault.patch (fixed upstream)
+
+-------------------------------------------------------------------
Old:
----
android-tools-33.0.3.tar.xz
fix-lpmake-help-segfault.patch
fix-mkbootimg-gki-path.patch
New:
----
android-tools-33.0.3p1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ android-tools.spec ++++++
--- /var/tmp/diff_new_pack.buG12M/_old 2022-11-08 10:55:34.149856588 +0100
+++ /var/tmp/diff_new_pack.buG12M/_new 2022-11-08 10:55:34.153856597 +0100
@@ -30,7 +30,7 @@
%endif
Name: android-tools
-Version: 33.0.3
+Version: 33.0.3p1
Release: 0
Summary: Android platform tools
License: Apache-2.0 AND MIT
@@ -40,21 +40,17 @@
Source2: man-pages.tar.gz
# PATCH-FIX-OPENSUSE fix-install-completion.patch boo#1185883
mun...@googlemail.com -- Simplify completion
Patch0: fix-install-completion.patch
-# PATCH-FIX-OPENSUSE fix-mkbootimg-gki-path.patch mun...@googlemail.com -- Set
gki path in mkbootimg.py
-Patch1: fix-mkbootimg-gki-path.patch
-# PATCH-FIX-UPSTREAM fix-lpmake-help-segfault.patch gh#nmeum/android-tools#73
-Patch2: fix-lpmake-help-segfault.patch
BuildRequires: clang
BuildRequires: cmake >= 3.12
BuildRequires: go
BuildRequires: gtest
BuildRequires: llvm-gold
BuildRequires: ninja
-BuildRequires: pcre2-devel
BuildRequires: pkgconfig
BuildRequires: python%{_pyn}
BuildRequires: pkgconfig(libbrotlicommon)
BuildRequires: pkgconfig(liblz4)
+BuildRequires: pkgconfig(libpcre2-8)
BuildRequires: pkgconfig(libunwind-generic)
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(libzstd)
@@ -67,7 +63,6 @@
Obsoletes: %{name}-python3 < %{version}-%{release}
ExcludeArch: s390x
%if 0%{?suse_version} <= 1500
-BuildRequires: gcc11
BuildRequires: gcc11-c++
%endif
@@ -108,26 +103,24 @@
# fix env-script-interpreter
sed -e '1s|^#!.*|#!/usr/bin/python%{_pyd}|' -i vendor/avb/avbtool.py \
vendor/mkbootimg/{mk,repack_,unpack_}bootimg.py \
- vendor/mkbootimg/gki/generate_gki_certificate.py
+ vendor/mkbootimg/gki/generate_gki_certificate.py \
+ vendor/libufdt/utils/src/mkdtboimg.py
%build
%define __builder ninja
-export CC=clang
-export CXX=clang++
export GOFLAGS="-mod=vendor -buildmode=pie -trimpath"
-%cmake -DBUILD_SHARED_LIBS:BOOL=OFF
+%cmake \
+ -DBUILD_SHARED_LIBS=OFF \
+ -DCMAKE_C_COMPILER=clang \
+ -DCMAKE_CXX_COMPILER=clang++
%cmake_build
%install
%cmake_install
-# avbtool
-cp -pd vendor/avb/avbtool{,.py} %{buildroot}%{_bindir}
-
-# mkbootimg/gki
-install -d -m 0755 %{buildroot}%{_prefix}/lib/%{name}
-cp -a vendor/mkbootimg/gki %{buildroot}%{_prefix}/lib/%{name}
+# fix non-executable-script
+chmod 0755
%{buildroot}%{_datadir}/%{name}/mkbootimg/gki/generate_gki_certificate.py
# man pages
install -d -m 0755 %{buildroot}%{_mandir}
@@ -136,17 +129,16 @@
%check
# call some tools to test python3 compatibility
export PATH=%{buildroot}%{_bindir}:$PATH
-export PYTHONPATH=%{buildroot}%{_prefix}/lib/%{name}:$PYTHONPATH
+export PYTHONDONTWRITEBYTECODE=1
avbtool version
mkbootimg --help
-rm -r %{buildroot}%{_prefix}/lib/%{name}/gki/__pycache__
%files
%license LICENSE
%doc README.md
%{_bindir}/adb
%{_bindir}/append2simg
-%{_bindir}/avbtool{,.py}
+%{_bindir}/avbtool
%{_bindir}/e2fsdroid
%{_bindir}/ext2simg
%{_bindir}/fastboot
@@ -160,9 +152,10 @@
%files mkbootimg
%license LICENSE
%{_bindir}/{mk,repack_,unpack_}bootimg
+%{_bindir}/mkdtboimg
%{_mandir}/man1/{mk,repack_,unpack_}bootimg.1%{?ext_man}
-%dir %{_prefix}/lib/%{name}
-%{_prefix}/lib/%{name}/gki
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/mkbootimg
%files partition
%license LICENSE
++++++ fix-install-completion.patch ++++++
--- /var/tmp/diff_new_pack.buG12M/_old 2022-11-08 10:55:34.197856701 +0100
+++ /var/tmp/diff_new_pack.buG12M/_new 2022-11-08 10:55:34.201856711 +0100
@@ -1,8 +1,8 @@
diff -ruN a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -6,8 +6,7 @@
- include(GNUInstallDirs)
+@@ -11,8 +11,7 @@
+ option(ANDROID_TOOLS_PATCH_VENDOR "Patch vendor projects using patches
directory" ON)
# Install bash/zsh completion files.
-set(COMPLETION_COMMON_DIR
"${CMAKE_INSTALL_FULL_DATADIR}/android-tools/completions")
++++++ vendor.tar.gz ++++++
