From 6bce9e2337ef7caaaca789d4a271587fce58182e Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Jul 23 2022 11:27:34 +0000
Subject: Update to 55e0266795bc09436ea45c3ead59d2925762d5c2


* Use new build system
* Add gtk3 dependency for first-launch

---

diff --git a/waydroid.spec b/waydroid.spec
index 8161032..0e8385e 100644
--- a/waydroid.spec
+++ b/waydroid.spec
@@ -3,7 +3,7 @@
 %global selinuxtype targeted
 
 Version:        1.2.1
-%global commit 7674914195ee988d0274a8ca43f63b73608a227a
+%global commit 55e0266795bc09436ea45c3ead59d2925762d5c2
 
 %forgemeta
 Name:           waydroid
@@ -27,6 +27,7 @@ BuildRequires:  systemd-rpm-macros
 
 Requires:       python-gbinder >= 1.1.0
 Requires:       lxc
+Requires:       gtk3
 Recommends:     python-pyclip
 Recommends:     wl-clipboard
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -57,27 +58,18 @@ cp %{S:1} SELinux/
 # Remove link for ROM files
 sed -i -e '/"system_channel":/ s/: ".*"/: ""/' tools/config/__init__.py
 sed -i -e '/"vendor_channel":/ s/: ".*"/: ""/' tools/config/__init__.py
-# Default to nftables
-sed -i 's/LXC_USE_NFT="false"/LXC_USE_NFT="true"/' data/scripts/waydroid-net.sh
 # Compile sepolicy
 cd SELinux
 %{__make} NAME=%{selinuxtype} -f /usr/share/selinux/devel/Makefile
 
 %install
-mkdir -p %{buildroot}%{_prefix}/lib/waydroid
-mkdir -p %{buildroot}%{_datadir}/applications
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_systemd_util_dir}/system-preset
-cp -r tools data waydroid.py "%{buildroot}%{_prefix}/lib/waydroid"
+%make_install LIBDIR=%{_libdir} DESTDIR=%{buildroot} USE_SYSTEMD=0 USE_NFTABLES=1
 %py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/waydroid
-ln -s ../lib/waydroid/waydroid.py "%{buildroot}%{_bindir}/waydroid"
-mv "%{buildroot}%{_prefix}/lib/waydroid/data/Waydroid.desktop" "%{buildroot}%{_datadir}/applications"
-mv "%{buildroot}%{_prefix}/lib/waydroid/data/waydroid.market.desktop" "%{buildroot}%{_datadir}/applications"
-cp %{S:3} %{buildroot}%{_unitdir}/
-cp %{S:4} %{buildroot}%{_unitdir}/
-cp %{S:5} %{buildroot}%{_systemd_util_dir}/system-preset/
+%{__install} -d %{buildroot}%{_unitdir} %{buildroot}%{_systemd_util_dir}/system-preset
 %{__install} -d %{buildroot}%{_datadir}/selinux/%{selinuxtype}
+%{__install} -p -m 644 %{S:3} %{buildroot}%{_unitdir}/
+%{__install} -p -m 644 %{S:4} %{buildroot}%{_unitdir}/
+%{__install} -p -m 644 %{S:5} %{buildroot}%{_systemd_util_dir}/system-preset/
 %{__install} -p -m 644 SELinux/%{name}.pp %{buildroot}%{_datadir}/selinux/%{selinuxtype}/%{name}.pp
 
 %post selinux