From cbac194725276fa9240847476540fbd97a429818fbff987d77b50593790af8d3 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 19 Aug 2020 06:01:33 +0000 Subject: [PATCH 1/2] Accepting request 827631 from home:dimstar:Factory - Fix wrong usage of %{_libexecdir} for systemd/firewalld owned paths. OBS-URL: https://build.opensuse.org/request/show/827631 OBS-URL: https://build.opensuse.org/package/show/network:utilities/nbd?expand=0&rev=69 --- nbd.changes | 6 ++++++ nbd.spec | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/nbd.changes b/nbd.changes index 5fc42c2..3275479 100644 --- a/nbd.changes +++ b/nbd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 18 15:27:46 UTC 2020 - Dominique Leuenberger + +- Fix wrong usage of %{_libexecdir} for systemd/firewalld owned + paths. + ------------------------------------------------------------------- Wed Mar 18 10:36:55 UTC 2020 - Paolo Stivanin diff --git a/nbd.spec b/nbd.spec index 8acdaf1..e411f6e 100644 --- a/nbd.spec +++ b/nbd.spec @@ -86,8 +86,8 @@ install -D -p -m 0644 %{SOURCE1} \ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-server # autoload nbd module -install -d -m 755 %{buildroot}%{_libexecdir}/modules-load.d/ -echo "nbd" > %{buildroot}%{_libexecdir}/modules-load.d/%{name}.conf +install -d -m 755 %{buildroot}%{_prefix}/lib/modules-load.d/ +echo "nbd" > %{buildroot}%{_prefix/lib}/modules-load.d/%{name}.conf #echo "#Port file options" > $RPM_BUILD_ROOT/etc/nbd-server.conf 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 %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 %post @@ -155,13 +155,13 @@ fi %ghost %config(noreplace) %{_sysconfdir}/nbd-server/config %ghost %config(noreplace) %{_sysconfdir}/nbd-server/allow %config %{_sysconfdir}/nbd-server/config.example -%dir %{_libexecdir}/modules-load.d/ -%{_libexecdir}/modules-load.d/nbd.conf +%dir %{_prefix}/lib/modules-load.d/ +%{_prefix}/lib/modules-load.d/nbd.conf %{_fillupdir}/sysconfig.%{name}-server %if %{use_firewalld} -%dir %{_libexecdir}/firewalld -%dir %{_libexecdir}/firewalld/services -%{_libexecdir}/firewalld/services/%{name}.xml +%dir %{_prefix}/lib/firewalld +%dir %{_prefix}/lib/firewalld/services +%{_prefix}/lib/firewalld/services/%{name}.xml %endif %changelog From 1dc259c327bc1a72b2a19872c2b8a56743f1c911ba64b545aa8862abae06c65e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 20 Aug 2020 07:44:33 +0000 Subject: [PATCH 2/2] Accepting request 827999 from home:dimstar:Factory Fix typo, sorry for the nhe noise OBS-URL: https://build.opensuse.org/request/show/827999 OBS-URL: https://build.opensuse.org/package/show/network:utilities/nbd?expand=0&rev=70 --- nbd.changes | 5 +++++ nbd.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nbd.changes b/nbd.changes index 3275479..02fa3d0 100644 --- a/nbd.changes +++ b/nbd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 20 07:03:13 UTC 2020 - Dominique Leuenberger + +- Fix typo in previous commit (%{prefix/lib} ->%{_prefix}/lib). + ------------------------------------------------------------------- Tue Aug 18 15:27:46 UTC 2020 - Dominique Leuenberger diff --git a/nbd.spec b/nbd.spec index e411f6e..837a407 100644 --- a/nbd.spec +++ b/nbd.spec @@ -87,7 +87,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-server # autoload nbd module install -d -m 755 %{buildroot}%{_prefix}/lib/modules-load.d/ -echo "nbd" > %{buildroot}%{_prefix/lib}/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 mkdir -p %{buildroot}%{_sysconfdir}/nbd-server