From 62258b8971f172625706e76b22284b6a9f038968693cf1278a85976cef632d72 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 27 Aug 2020 11:41:14 +0000 Subject: [PATCH] Accepting request 827856 from home:gmbr3:libexecdir - Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) OBS-URL: https://build.opensuse.org/request/show/827856 OBS-URL: https://build.opensuse.org/package/show/network:vpn/ocserv?expand=0&rev=35 --- ocserv.changes | 5 +++++ ocserv.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ocserv.changes b/ocserv.changes index 3adb478..2f097de 100644 --- a/ocserv.changes +++ b/ocserv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 19 10:46:22 UTC 2020 - Callum Farmer + +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) + ------------------------------------------------------------------- Fri Jul 3 17:34:58 UTC 2020 - Michael Du diff --git a/ocserv.spec b/ocserv.spec index 1790a10..60bb7aa 100644 --- a/ocserv.spec +++ b/ocserv.spec @@ -110,7 +110,7 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install install -Dm 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysctl.d/60-ocserv.conf %if 0%{suse_version} >= 1500 -install -D -m 644 %{SOURCE6} %{buildroot}%{_libexecdir}/firewalld/services/ocserv.xml +install -D -m 644 %{SOURCE6} %{buildroot}%{_prefix}/lib/firewalld/services/ocserv.xml %endif install -d %{buildroot}%{_sysconfdir}/ocserv/certificates @@ -149,9 +149,9 @@ install -m 0644 doc/systemd/socket-activated/ocserv.service %{buildroot}%{_unitd %config %{_sysconfdir}/ocserv %config(noreplace) %{_sysconfdir}/sysctl.d/60-ocserv.conf %if 0%{suse_version} >= 1500 -%dir %{_libexecdir}/firewalld -%dir %{_libexecdir}/firewalld/services -%{_libexecdir}/firewalld/services/ocserv.xml +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services +%{_prefix}/lib/firewalld/services/ocserv.xml %endif %{_bindir}/occtl %{_bindir}/ocpasswd