From 006954ec93a8c5bcebcd7efcbe98b958b2361310 Mon Sep 17 00:00:00 2001 From: sharpenedblade <sharpenedblade@proton.me> Date: Sun, 4 Jun 2023 23:26:01 -0700 Subject: [PATCH] fix: Reference sources using the SOURCE macro --- t2linux-config/t2linux-config.spec | 4 ++-- t2linux-repo/t2linux-repo.spec | 13 +++---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/t2linux-config/t2linux-config.spec b/t2linux-config/t2linux-config.spec index eadefa1..70b0cf4 100644 --- a/t2linux-config/t2linux-config.spec +++ b/t2linux-config/t2linux-config.spec @@ -22,8 +22,8 @@ echo -e 'add_drivers+=" apple_bce snd_seq "' > t2linux-modules-install.conf %install -install -D -m 755 %{_sourcedir}/firmware.sh %{buildroot}/%{_bindir}/firmware.sh -install -Dm 755 %{_sourcedir}/touchbar.sh %{buildroot}/%{_bindir}/touchbar.sh +install -D -m 755 %{SOURCE0} %{buildroot}/%{_bindir}/touchbar.sh +install -D -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/firmware.sh install -D -m 644 t2linux-modules-install.conf %{buildroot}/etc/dracut.conf.d/t2linux-modules-install.conf diff --git a/t2linux-repo/t2linux-repo.spec b/t2linux-repo/t2linux-repo.spec index 9db4e98..3bee60b 100644 --- a/t2linux-repo/t2linux-repo.spec +++ b/t2linux-repo/t2linux-repo.spec @@ -17,19 +17,12 @@ DNF repo files for linux on t2 macs. %build %install -install -d -m 755 %{_builddir}/etc/pki/rpm-gpg -install -m 644 t2linux-fedora.pub $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ -install -m 644 t2linux-fedora-new.pub $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ +install -D -m 644 %{SOURCE0} %{buildroot}/etc/pki/rpm-gpg/t2linux-fedora.pub +install -D -m 644 %{SOURCE1} %{buildroot}/etc/pki/rpm-gpg/t2linux-fedora-new.pub -install -d -m 755 %{_builddir}/etc/yum.repos.d -install -m 644 t2linux-fedora.repo $RPM_BUILD_ROOT/etc/yum.repos.d +install -D -m 644 %{SOURCE2} %{buildroot}/etc/yum.repos.d/t2linux-fedora.repo %files /etc/yum.repos.d/t2linux-fedora.repo /etc/pki/rpm-gpg/t2linux-fedora.pub /etc/pki/rpm-gpg/t2linux-fedora-new.pub - -%changelog - -* Mon Apr 24 2023 Sharpened Blade <sharpenedblade@proton.me> -- Made public GPG key ascii-armored