From 9416afcbf7310a07177ebfaa634de56a89f849f9 Mon Sep 17 00:00:00 2001 From: Peter G Date: Tue, 8 Oct 2024 20:46:13 +0200 Subject: [PATCH] [systemd] Drop rpm macro compat symlink Likely not needed anymore. Also it was a dangling link pointing to /usr/lib64 on aarch64. --- rpm/systemd-mini.spec | 9 --------- rpm/systemd.spec | 9 --------- 2 files changed, 18 deletions(-) diff --git a/rpm/systemd-mini.spec b/rpm/systemd-mini.spec index a770ca8..84e51f9 100644 --- a/rpm/systemd-mini.spec +++ b/rpm/systemd-mini.spec @@ -377,14 +377,6 @@ install -m 644 %{SOURCE2} %{buildroot}/opt/tests/systemd-tests rm -rf %{buildroot}/%{_docdir} %endif -# systemd macros -# Old rpm versions assume macros in /etc/rpm/ -# New ones support /usr/lib/rpm/macros.d/ -# Systemd naturually uses later one -# But we support both by adding link -mkdir -p %{buildroot}%{_sysconfdir}/rpm -ln -s %{_libdir}/rpm/macros.d/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd - # Remove unneeded files rm %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh @@ -478,7 +470,6 @@ for a in `find /etc/systemd/system -type l ! -exec test -e {} \; -print`; do sta %ghost %{_sysconfdir}/udev/hwdb.bin %{_rpmconfigdir}/macros.d/macros.systemd %dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/rpm/macros.systemd %{_bindir}/systemctl %{_bindir}/systemd-notify %{_bindir}/systemd-escape diff --git a/rpm/systemd.spec b/rpm/systemd.spec index 6b3b1fa..aaeccc5 100644 --- a/rpm/systemd.spec +++ b/rpm/systemd.spec @@ -376,14 +376,6 @@ install -m 644 %{SOURCE2} %{buildroot}/opt/tests/systemd-tests rm -rf %{buildroot}/%{_docdir} %endif -# systemd macros -# Old rpm versions assume macros in /etc/rpm/ -# New ones support /usr/lib/rpm/macros.d/ -# Systemd naturually uses later one -# But we support both by adding link -mkdir -p %{buildroot}%{_sysconfdir}/rpm -ln -s %{_libdir}/rpm/macros.d/macros.systemd %{buildroot}%{_sysconfdir}/rpm/macros.systemd - # Remove unneeded files rm %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh @@ -477,7 +469,6 @@ for a in `find /etc/systemd/system -type l ! -exec test -e {} \; -print`; do sta %ghost %{_sysconfdir}/udev/hwdb.bin %{_rpmconfigdir}/macros.d/macros.systemd %dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/rpm/macros.systemd %{_bindir}/systemctl %{_bindir}/systemd-notify %{_bindir}/systemd-escape