From 5a583bb75dc368438e33282f90393e7aa044ab69 Mon Sep 17 00:00:00 2001 From: nephros Date: Thu, 16 Sep 2021 10:56:48 +0200 Subject: [PATCH 1/3] [systemd] use _userunitdir macro in .spec file --- rpm/patchmanager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/patchmanager.spec b/rpm/patchmanager.spec index 5eae10d7..a488560c 100755 --- a/rpm/patchmanager.spec +++ b/rpm/patchmanager.spec @@ -55,8 +55,8 @@ ln -s ../dbus-org.SfietKonstantin.patchmanager.service %{buildroot}%{_unitdir}/m mkdir -p %{buildroot}%{_unitdir}/timers.target.wants/ ln -s ../checkForUpdates-org.SfietKonstantin.patchmanager.timer %{buildroot}%{_unitdir}/timers.target.wants/ -mkdir -p %{buildroot}/usr/lib/systemd/user/lipstick.service.wants/ -ln -s ../lipstick-patchmanager.service %{buildroot}/usr/lib/systemd/user/lipstick.service.wants/ +mkdir -p %{buildroot}/%{_userunitdir}/lipstick.service.wants/ +ln -s ../lipstick-patchmanager.service %{buildroot}/%{_userunitdir}/lipstick.service.wants/ mkdir -p %{buildroot}%{_datadir}/%{name}/patches From 4fa3e0fc06f086b37d3723d0a018fa1320ec25e5 Mon Sep 17 00:00:00 2001 From: nephros Date: Thu, 16 Sep 2021 10:58:01 +0200 Subject: [PATCH 2/3] [aarch64] use LIBDIR variable instead of hardcoded path --- src/preload/preload.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/preload/preload.pro b/src/preload/preload.pro index 8ef1bc92..157f7966 100644 --- a/src/preload/preload.pro +++ b/src/preload/preload.pro @@ -12,6 +12,6 @@ SOURCES += \ src/preloadpatchmanager.c TARGET = preloadpatchmanager -target.path = /usr/lib +target.path = $$LIBDIR INSTALLS = target From d019e9094c3b8e372947819840158b9bb1cbc8b7 Mon Sep 17 00:00:00 2001 From: nephros Date: Thu, 16 Sep 2021 14:59:22 +0200 Subject: [PATCH 3/3] [cleanup] fix ancient typo in .spec %pre --- rpm/patchmanager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/patchmanager.spec b/rpm/patchmanager.spec index a488560c..68d7f118 100755 --- a/rpm/patchmanager.spec +++ b/rpm/patchmanager.spec @@ -73,7 +73,7 @@ if [ ! -d /var/lib/patchmanager/ausmt/patches/ ] then exit 0 else - /usr/sbin/patchnamager --unapply-all || : + /usr/sbin/patchmanager --unapply-all || : fi if [ "$(ls -A /var/lib/patchmanager/ausmt/patches/)" ] then