Compare commits

...

2 Commits

Author SHA1 Message Date
Owen Zimmerman 03f8686789 Merge branch 'frawhide' into owen/depricate-dtx 2025-10-14 20:32:29 -05:00
Owen 1c2366c3be deprecate: terra-surface-dtx-daemon
Signed-off-by: Owen <owen@fyralabs.com>
2025-10-14 19:46:50 -05:00
2 changed files with 54 additions and 43 deletions
@@ -1,80 +1,92 @@
### THIS PACKAGE HAS BEEN DEPRECATED AS THE REASON FOR ITS EXISTANCE HAS BEEN FIXED IN THE UPSTREAM VERSION ###
%global debug_package %{nil} %global debug_package %{nil}
%global ver v0.3.10-1 %global ver v0.3.10-1
%global ver2 %(echo %{ver} | sed 's/^v//') %global ver2 %(echo %{ver} | sed 's/^v//')
Name: terra-surface-dtx-daemon Name: terra-surface-dtx-daemon-deprecated
Version: %(echo %ver | sed 's/-/~/g') Version: %(echo %ver | sed 's/-/~/g')
Release: 4%{?dist} Release: 5%{?dist}
Summary: Surface Detachment System (DTX) Daemon Summary: Surface Detachment System (DTX) Daemon
License: MIT License: MIT
URL: https://github.com/linux-surface/surface-dtx-daemon URL: https://github.com/linux-surface/surface-dtx-daemon
Source: %url/archive/refs/tags/%ver.tar.gz Source: %url/archive/refs/tags/%ver.tar.gz
BuildRequires: rust cargo dbus-devel anda-srpm-macros cargo-rpm-macros mold
Packager: Owen Zimmerman <owen@fyralabs.com> Packager: Owen Zimmerman <owen@fyralabs.com>
Obsoletes: surface-dtx-daemon < 0.3.8~1-3
Obsoletes: terra-surface-dtx-daemon <= 0.3.10-1
Obsoletes: terra-surface-dtx-daemon-bash-completion <= 0.3.10-1
Obsoletes: terra-surface-dtx-daemon-fish-completion <= 0.3.10-1
Obsoletes: terra-surface-dtx-daemon-zsh-completion <= 0.3.10-1
Requires: surface-dtx-daemon >= 0.3.10-1
%description %description
Linux User-Space Detachment System (DTX) Daemon for the Surface ACPI Driver Linux User-Space Detachment System (DTX) Daemon for the Surface ACPI Driver
(and Surface Books). Currently only the Surface Book 2 is supported, due to (and Surface Books). Currently only the Surface Book 2 is supported, due to
lack of driver-support on the Surface Book 1. This may change in the future. lack of driver-support on the Surface Book 1. This may change in the future.
%pkg_completion -Bfz surface-dtx-daemon surface-dtx-userd %dnl %pkg_completion -Bfz surface-dtx-daemon surface-dtx-userd
%prep %prep
%autosetup -n surface-dtx-daemon-%{ver2} %dnl %autosetup -n surface-dtx-daemon-%{ver2}
%cargo_prep_online %dnl %cargo_prep_online
%build %dnl %build
export CARGO_TARGET_DIR="$PWD/target" %dnl export CARGO_TARGET_DIR="$PWD/target"
%cargo_build -- --locked %dnl %cargo_build -- --locked
%install %install
echo "THIS PACKAGE HAS BEEN DEPRECATED AS THE REASON FOR ITS EXISTANCE HAS BEEN FIXED IN THE UPSTREAM VERSION. PLEASE USE THE `surface-dtx-daemon` PACKAGE INSTEAD!" >> README.md
# binary files # binary files
install -D -m755 "target/rpm/surface-dtx-daemon" "%{buildroot}%{_bindir}/surface-dtx-daemon" %dnl install -D -m755 "target/rpm/surface-dtx-daemon" "%{buildroot}%{_bindir}/surface-dtx-daemon"
install -D -m755 "target/rpm/surface-dtx-userd" "%{buildroot}%{_bindir}/surface-dtx-userd" %dnl install -D -m755 "target/rpm/surface-dtx-userd" "%{buildroot}%{_bindir}/surface-dtx-userd"
# application files # application files
install -D -m644 "target/etc/dtx/surface-dtx-daemon.conf" "%{buildroot}/etc/surface-dtx/surface-dtx-daemon.conf" %dnl install -D -m644 "target/etc/dtx/surface-dtx-daemon.conf" "%{buildroot}/etc/surface-dtx/surface-dtx-daemon.conf"
install -D -m644 "target/etc/dtx/surface-dtx-userd.conf" "%{buildroot}/etc/surface-dtx/surface-dtx-userd.conf" %dnl install -D -m644 "target/etc/dtx/surface-dtx-userd.conf" "%{buildroot}/etc/surface-dtx/surface-dtx-userd.conf"
install -D -m755 "target/etc/dtx/attach.sh" "%{buildroot}/etc/surface-dtx/attach.sh" %dnl install -D -m755 "target/etc/dtx/attach.sh" "%{buildroot}/etc/surface-dtx/attach.sh"
install -D -m755 "target/etc/dtx/detach.sh" "%{buildroot}/etc/surface-dtx/detach.sh" %dnl install -D -m755 "target/etc/dtx/detach.sh" "%{buildroot}/etc/surface-dtx/detach.sh"
install -D -m644 "target/etc/systemd/surface-dtx-daemon.service" "%{buildroot}/usr/lib/systemd/system/surface-dtx-daemon.service" %dnl install -D -m644 "target/etc/systemd/surface-dtx-daemon.service" "%{buildroot}/usr/lib/systemd/system/surface-dtx-daemon.service"
install -D -m644 "target/etc/systemd/surface-dtx-userd.service" "%{buildroot}/usr/lib/systemd/user/surface-dtx-userd.service" %dnl install -D -m644 "target/etc/systemd/surface-dtx-userd.service" "%{buildroot}/usr/lib/systemd/user/surface-dtx-userd.service"
install -D -m644 "target/etc/dbus/org.surface.dtx.conf" "%{buildroot}/etc/dbus-1/system.d/org.surface.dtx.conf" %dnl install -D -m644 "target/etc/dbus/org.surface.dtx.conf" "%{buildroot}/etc/dbus-1/system.d/org.surface.dtx.conf"
install -D -m644 "target/etc/udev/40-surface_dtx.rules" "%{buildroot}/etc/udev/rules.d/40-surface_dtx.rules" %dnl install -D -m644 "target/etc/udev/40-surface_dtx.rules" "%{buildroot}/etc/udev/rules.d/40-surface_dtx.rules"
# completion files # completion files
install -D -m644 "target/surface-dtx-daemon.bash" "%{buildroot}/usr/share/bash-completion/completions/surface-dtx-daemon" %dnl install -D -m644 "target/surface-dtx-daemon.bash" "%{buildroot}/usr/share/bash-completion/completions/surface-dtx-daemon"
install -D -m644 "target/surface-dtx-userd.bash" "%{buildroot}/usr/share/bash-completion/completions/surface-dtx-userd" %dnl install -D -m644 "target/surface-dtx-userd.bash" "%{buildroot}/usr/share/bash-completion/completions/surface-dtx-userd"
install -D -m644 "target/_surface-dtx-daemon" "%{buildroot}/usr/share/zsh/site-functions/_surface-dtx-daemon" %dnl install -D -m644 "target/_surface-dtx-daemon" "%{buildroot}/usr/share/zsh/site-functions/_surface-dtx-daemon"
install -D -m644 "target/_surface-dtx-userd" "%{buildroot}/usr/share/zsh/site-functions/_surface-dtx-userd" %dnl install -D -m644 "target/_surface-dtx-userd" "%{buildroot}/usr/share/zsh/site-functions/_surface-dtx-userd"
install -D -m644 "target/surface-dtx-daemon.fish" "%{buildroot}/usr/share/fish/vendor_completions.d/surface-dtx-daemon.fish" %dnl install -D -m644 "target/surface-dtx-daemon.fish" "%{buildroot}/usr/share/fish/vendor_completions.d/surface-dtx-daemon.fish"
install -D -m644 "target/surface-dtx-userd.fish" "%{buildroot}/usr/share/fish/vendor_completions.d/surface-dtx-userd.fish" %dnl install -D -m644 "target/surface-dtx-userd.fish" "%{buildroot}/usr/share/fish/vendor_completions.d/surface-dtx-userd.fish"
# These systemd services should be included in the preset file for Ultramarine Linux Surface images # These systemd services should be included in the preset file for Ultramarine Linux Surface images
%post %dnl %post
%systemd_post surface-dtx-daemon.service %dnl %systemd_post surface-dtx-daemon.service
%systemd_user_post surface-dtx-userd.service %dnl %systemd_user_post surface-dtx-userd.service
%preun %dnl %preun
%systemd_preun surface-dtx-daemon.service %dnl %systemd_preun surface-dtx-daemon.service
%systemd_user_preun surface-dtx-userd.service %dnl %systemd_user_preun surface-dtx-userd.service
%postun %dnl %postun
%systemd_postun_with_restart surface-dtx-daemon.service %dnl %systemd_postun_with_restart surface-dtx-daemon.service
%systemd_user_postun_with_restart surface-dtx-userd.service %dnl %systemd_user_postun_with_restart surface-dtx-userd.service
%files %files
%config /etc/dbus-1/system.d/org.surface.dtx.conf %doc README.md
%config /etc/udev/rules.d/40-surface_dtx.rules %dnl %config /etc/dbus-1/system.d/org.surface.dtx.conf
%config(noreplace) /etc/surface-dtx/* %dnl %config /etc/udev/rules.d/40-surface_dtx.rules
/usr/bin/surface-dtx-daemon %dnl %config(noreplace) /etc/surface-dtx/*
/usr/bin/surface-dtx-userd %dnl /usr/bin/surface-dtx-daemon
/usr/lib/systemd/system/surface-dtx-daemon.service %dnl /usr/bin/surface-dtx-userd
/usr/lib/systemd/user/surface-dtx-userd.service %dnl /usr/lib/systemd/system/surface-dtx-daemon.service
%dnl /usr/lib/systemd/user/surface-dtx-userd.service
%changelog %changelog
* Tue Oct 14 2025 Owen Zimmerman <owen@fyralabs.com>
- deprecate terra-surface-dtx-daemon in favor of upstream package
* Wed Feb 5 2025 Owen Zimmerman <owen@fyralabs.com> * Wed Feb 5 2025 Owen Zimmerman <owen@fyralabs.com>
- rename to terra-surface-dtx-daemon - rename to terra-surface-dtx-daemon
@@ -1 +0,0 @@
rpm.global("ver", gh("linux-surface/surface-dtx-daemon"));