From 418c4c37ad8d36dcd3bbfcd1e033384b2033ffb0 Mon Sep 17 00:00:00 2001
From: sharpenedblade <sharpenedblade@proton.me>
Date: Sat, 28 Jan 2023 10:06:45 -0800
Subject: [PATCH] Fix touchbar suspend and remove suspend script.

---
 build.sh            |  4 ++--
 t2linux-config.spec | 12 ++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/build.sh b/build.sh
index 11640bb..c198d74 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 
 FEDORA_KERNEL_VERSION=6.1.7-200.fc37
 PATCHES_GIT=https://github.com/t2linux/linux-t2-patches
-PATCHES_COMMIT=1195754e6fd0ee3dd6b1f6e05a034db1af53551d
+PATCHES_COMMIT=ad1f804d54bc5c263695c6140d4602c5787004d1
 
 echo "=====INSTALLING DEPENDENCIES====="
 dnf install -y fedpkg koji fedora-packager git curl pesign ncurses-devel libbpf fedpkg rpmdevtools ccache openssl-devel libkcapi libkcapi-devel libkcapi-static libkcapi-tools rpm-sign
@@ -32,7 +32,7 @@ git checkout ${PATCHES_COMMIT}
 echo "=====PREPARING SOURCES====="
 cd ~/rpmbuild/SPECS
 sed -i 's/# define buildid .local/%define buildid .t2/g' kernel.spec
-sed -i 's/%define pkgrelease 200/%define pkgrelease 201/' kernel.spec
+sed -i 's/%define pkgrelease 200/%define pkgrelease 202/' kernel.spec
 mv -f /repo/python-blivet.spec /repo/rpmbuild/SPECS/python-blivet.spec
 mv /repo/0002-add-t2-support.patch /root/rpmbuild/SOURCES/0002-add-t2-support.patch
 cat /tmp/download/*/extra_config > /root/rpmbuild/SOURCES/kernel-local
diff --git a/t2linux-config.spec b/t2linux-config.spec
index 7ea7b4d..9a93d94 100644
--- a/t2linux-config.spec
+++ b/t2linux-config.spec
@@ -1,14 +1,12 @@
 Name: t2linux-config
-Version: 6.1.6
-Release: 2%{?dist}
+Version: 6.2.0
+Release: 1%{?dist}
 Summary: System configuration for linux on t2 macs.
 License: MIT
 
 %undefine _disable_source_fetch
 
 URL: https://t2linux.org
-Source0: https://wiki.t2linux.org/tools/rmmod_tb.sh
-
 
 %global audio_config_commit_long e46839a28963e2f7d364020518b9dac98236bcae
 %global audio_config_commit %(c=%{audio_config_commit_long}; echo ${c:0:7})  
@@ -18,7 +16,6 @@ Source1: https://github.com/kekrby/t2-better-audio/archive/%{audio_config_commit
 Configuration files for linux on t2 macs. Everything works except for TouchId, eGPU, and audio switching.
 
 %prep
-cp %{_sourcedir}/rmmod_tb.sh %{_builddir}
 tar -xf %{_sourcedir}/t2-better-audio-%{audio_config_commit}.tar.gz
 
 %build
@@ -33,10 +30,6 @@ mv t2linux-install.conf %{buildroot}/etc/dracut.conf.d/t2linux-install.conf
 mkdir -p %{buildroot}/etc/modules-load.d/
 mv t2linux.conf %{buildroot}/etc/modules-load.d/t2linux.conf
 
-mkdir -p %{buildroot}/lib/systemd/system-sleep
-mv %{_builddir}/rmmod_tb.sh %{buildroot}/lib/systemd/system-sleep/rmmod_tb.sh
-chmod +x %{buildroot}/lib/systemd/system-sleep/*
-
 mkdir -p %{buildroot}/usr/lib/udev/rules.d/
 cp -r %{_builddir}/t2-better-audio-%{audio_config_commit_long}/files/91-audio-custom.rules %{buildroot}/usr/lib/udev/rules.d/
 
@@ -52,7 +45,6 @@ grubby --args="intel_iommu=on iommu=pt pcie_ports=compat" --update-kernel=ALL
 
 %files
 /etc/modules-load.d/t2linux.conf
-/lib/systemd/system-sleep/rmmod_tb.sh
 /etc/dracut.conf.d/t2linux-install.conf
 /usr/share/alsa-card-profile/mixer
 /usr/share/pulseaudio/alsa-mixer