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
This commit is contained in:
Dominique Leuenberger 2020-08-27 11:41:14 +00:00 committed by Git OBS Bridge
parent 0da65a902f
commit 62258b8971
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Aug 19 10:46:22 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 3 17:34:58 UTC 2020 - Michael Du <duyizhaozj321@yahoo.com> Fri Jul 3 17:34:58 UTC 2020 - Michael Du <duyizhaozj321@yahoo.com>

View File

@ -110,7 +110,7 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install
install -Dm 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysctl.d/60-ocserv.conf install -Dm 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysctl.d/60-ocserv.conf
%if 0%{suse_version} >= 1500 %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 %endif
install -d %{buildroot}%{_sysconfdir}/ocserv/certificates 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 %{_sysconfdir}/ocserv
%config(noreplace) %{_sysconfdir}/sysctl.d/60-ocserv.conf %config(noreplace) %{_sysconfdir}/sysctl.d/60-ocserv.conf
%if 0%{suse_version} >= 1500 %if 0%{suse_version} >= 1500
%dir %{_libexecdir}/firewalld %dir %{_prefix}/lib/firewalld
%dir %{_libexecdir}/firewalld/services %dir %{_prefix}/lib/firewalld/services
%{_libexecdir}/firewalld/services/ocserv.xml %{_prefix}/lib/firewalld/services/ocserv.xml
%endif %endif
%{_bindir}/occtl %{_bindir}/occtl
%{_bindir}/ocpasswd %{_bindir}/ocpasswd