rpm/fetchmail
SHA256
1
0
Fork 0
forked from pool/fetchmail
Code Pull Requests Activity

Accepting request 830264 from home:gmbr3:libexecdir

Browse Source 
- 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
This commit is contained in:
Dirk Stoecker 2020-09-01 14:44:01 +00:00 committed by Git OBS Bridge
parent a1351922ef
commit 4c151a5555
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fetchmail.changes
View File

@ -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> Wed Aug 26 17:48:08 UTC 2020 - Pedro Monreal Gonzalez <pmonreal@suse.com>

2
fetchmail.service
View File

@ -5,7 +5,7 @@ After=network.target
[Service] [Service]
EnvironmentFile=-/etc/sysconfig/fetchmail EnvironmentFile=-/etc/sysconfig/fetchmail
User=fetchmail User=fetchmail
ExecStart=/usr/lib/fetchmail-systemd-exec ExecStart=@LIBEXECDIR@/fetchmail-systemd-exec
RestartSec=1 RestartSec=1
[Install] [Install]

16
fetchmail.spec
View File

@ -98,15 +98,17 @@ make %{?_smp_mflags} LDFLAGS="-pie"
%install %install
%make_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 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
cp fetchmail.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/fetchmail cp fetchmail.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/fetchmail
mkdir -p %{buildroot}/sbin mkdir -p %{buildroot}/sbin
mkdir -p %{buildroot}/%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
mkdir -p %{buildroot}/%{_tmpfilesdir} mkdir -p %{buildroot}%{_tmpfilesdir}
install -m 0644 %{SOURCE6} %{buildroot}/%{_unitdir}/%{name}.service sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE6}
install -m 0644 %{SOURCE7} %{buildroot}/%{_tmpfilesdir}/%{name}.conf install -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
install -m 0755 %{SOURCE8} %{buildroot}/%{_prefix}/lib/%{name}-systemd-exec 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} mkdir -p %{buildroot}%{_sbindir}
ln -s service %{buildroot}%{_sbindir}/rc%{name} ln -s service %{buildroot}%{_sbindir}/rc%{name}
touch %{buildroot}%{_sysconfdir}/fetchmailrc touch %{buildroot}%{_sysconfdir}/fetchmailrc
@ -160,7 +162,7 @@ make %{?_smp_mflags} check
%config(noreplace) %{_sysconfdir}/logrotate.d/fetchmail %config(noreplace) %{_sysconfdir}/logrotate.d/fetchmail
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}
%{_prefix}/lib/%{name}-systemd-exec %{_libexecdir}/%{name}-systemd-exec
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf
%{_fillupdir}/sysconfig.%{name} %{_fillupdir}/sysconfig.%{name}