From 4c151a5555ed51f3dc346336361a628dbd3607bd5a08fabc70d0864eaf41b2a2 Mon Sep 17 00:00:00 2001
From: Dirk Stoecker <opensuse@dstoecker.de>
Date: Tue, 1 Sep 2020 14:44:01 +0000
Subject: [PATCH] Accepting request 830264 from home:gmbr3:libexecdir

- De-hardcode /usr/lib path for launch executable (bsc#1174075)
- Spec file cleanups

OBS-URL: https://build.opensuse.org/request/show/830264
OBS-URL: https://build.opensuse.org/package/show/server:mail/fetchmail?expand=0&rev=98
---
 fetchmail.changes |  6 ++++++
 fetchmail.service |  2 +-
 fetchmail.spec    | 16 +++++++++-------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/fetchmail.changes b/fetchmail.changes
index 2cc0270..296640a 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 28 10:08:46 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
+
+- De-hardcode /usr/lib path for launch executable (bsc#1174075)
+- Spec file cleanups
+
 -------------------------------------------------------------------
 Wed Aug 26 17:48:08 UTC 2020 - Pedro Monreal Gonzalez <pmonreal@suse.com>
 
diff --git a/fetchmail.service b/fetchmail.service
index b81f557..8f093ad 100644
--- a/fetchmail.service
+++ b/fetchmail.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 EnvironmentFile=-/etc/sysconfig/fetchmail
 User=fetchmail
-ExecStart=/usr/lib/fetchmail-systemd-exec
+ExecStart=@LIBEXECDIR@/fetchmail-systemd-exec
 RestartSec=1
 
 [Install]
diff --git a/fetchmail.spec b/fetchmail.spec
index 73ed380..9c7d9f0 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -98,15 +98,17 @@ make %{?_smp_mflags} LDFLAGS="-pie"
 
 %install
 %make_install
-ln -sf fetchmail.1.gz %{buildroot}/%{_mandir}/man1/fetchmailconf.1.gz
+ln -sf fetchmail.1.gz %{buildroot}%{_mandir}/man1/fetchmailconf.1.gz
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 cp fetchmail.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/fetchmail
 mkdir -p %{buildroot}/sbin
-mkdir -p %{buildroot}/%{_unitdir}
-mkdir -p %{buildroot}/%{_tmpfilesdir}
-install -m 0644 %{SOURCE6} %{buildroot}/%{_unitdir}/%{name}.service
-install -m 0644 %{SOURCE7} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
-install -m 0755 %{SOURCE8} %{buildroot}/%{_prefix}/lib/%{name}-systemd-exec
+mkdir -p %{buildroot}%{_unitdir}
+mkdir -p %{buildroot}%{_tmpfilesdir}
+sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE6}
+install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
+install -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+mkdir -p %{buildroot}%{_libexecdir}
+install -m 0755 %{SOURCE8} %{buildroot}%{_libexecdir}/%{name}-systemd-exec
 mkdir -p %{buildroot}%{_sbindir}
 ln -s service %{buildroot}%{_sbindir}/rc%{name}
 touch %{buildroot}%{_sysconfdir}/fetchmailrc
@@ -160,7 +162,7 @@ make %{?_smp_mflags} check
 %config(noreplace) %{_sysconfdir}/logrotate.d/fetchmail
 %{_unitdir}/%{name}.service
 %{_sbindir}/rc%{name}
-%{_prefix}/lib/%{name}-systemd-exec
+%{_libexecdir}/%{name}-systemd-exec
 %{_tmpfilesdir}/%{name}.conf
 %{_fillupdir}/sysconfig.%{name}