Accepting request 828024 from network:utilities

OBS-URL: https://build.opensuse.org/request/show/828024
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nbd?expand=0&rev=52
This commit is contained in:
Dominique Leuenberger 2020-08-21 17:01:38 +00:00 committed by Git OBS Bridge
commit b023c5da5f
2 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Aug 20 07:03:13 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix typo in previous commit (%{prefix/lib} ->%{_prefix}/lib).
-------------------------------------------------------------------
Tue Aug 18 15:27:46 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix wrong usage of %{_libexecdir} for systemd/firewalld owned
paths.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 18 10:36:55 UTC 2020 - Paolo Stivanin <info@paolostivanin.com> Wed Mar 18 10:36:55 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>

View File

@ -86,8 +86,8 @@ install -D -p -m 0644 %{SOURCE1} \
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-server ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-server
# autoload nbd module # autoload nbd module
install -d -m 755 %{buildroot}%{_libexecdir}/modules-load.d/ install -d -m 755 %{buildroot}%{_prefix}/lib/modules-load.d/
echo "nbd" > %{buildroot}%{_libexecdir}/modules-load.d/%{name}.conf echo "nbd" > %{buildroot}%{_prefix}/lib/modules-load.d/%{name}.conf
#echo "#Port file options" > $RPM_BUILD_ROOT/etc/nbd-server.conf #echo "#Port file options" > $RPM_BUILD_ROOT/etc/nbd-server.conf
mkdir -p %{buildroot}%{_sysconfdir}/nbd-server mkdir -p %{buildroot}%{_sysconfdir}/nbd-server
@ -98,7 +98,7 @@ install -D -p -m 0644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%{name}-ser
# install firewall information file # install firewall information file
%if %{use_firewalld} %if %{use_firewalld}
install -D -m 644 %{SOURCE10} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml install -D -m 644 %{SOURCE10} %{buildroot}%{_prefix}/lib/firewalld/services/%{name}.xml
%endif %endif
%post %post
@ -155,13 +155,13 @@ fi
%ghost %config(noreplace) %{_sysconfdir}/nbd-server/config %ghost %config(noreplace) %{_sysconfdir}/nbd-server/config
%ghost %config(noreplace) %{_sysconfdir}/nbd-server/allow %ghost %config(noreplace) %{_sysconfdir}/nbd-server/allow
%config %{_sysconfdir}/nbd-server/config.example %config %{_sysconfdir}/nbd-server/config.example
%dir %{_libexecdir}/modules-load.d/ %dir %{_prefix}/lib/modules-load.d/
%{_libexecdir}/modules-load.d/nbd.conf %{_prefix}/lib/modules-load.d/nbd.conf
%{_fillupdir}/sysconfig.%{name}-server %{_fillupdir}/sysconfig.%{name}-server
%if %{use_firewalld} %if %{use_firewalld}
%dir %{_libexecdir}/firewalld %dir %{_prefix}/lib/firewalld
%dir %{_libexecdir}/firewalld/services %dir %{_prefix}/lib/firewalld/services
%{_libexecdir}/firewalld/services/%{name}.xml %{_prefix}/lib/firewalld/services/%{name}.xml
%endif %endif
%changelog %changelog