From e24a065f4cc1ef92a35962ff87ddd2e1fe2158fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Sun, 22 Sep 2019 11:35:32 +0200 Subject: [PATCH] Drop buildroot prefix in nm_dispatcher_dir macro Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385), report and fix from Lucien Weller, thanks! --- puppet.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/puppet.spec b/puppet.spec index 24019e6..b7445e2 100644 --- a/puppet.spec +++ b/puppet.spec @@ -24,14 +24,14 @@ %global pending_upgrade_file %{pending_upgrade_path}/upgrade_pending %if 0%{?fedora} > 30 || 0%{?rhel} > 8 -%global nm_dispatcher_dir %{buildroot}%{_prefix}/lib/NetworkManager +%global nm_dispatcher_dir %{_prefix}/lib/NetworkManager %else -%global nm_dispatcher_dir %{buildroot}%{_sysconfdir}/NetworkManager +%global nm_dispatcher_dir %{_sysconfdir}/NetworkManager %endif Name: puppet Version: 5.5.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A network tool for managing many disparate systems License: ASL 2.0 URL: http://puppetlabs.com @@ -389,6 +389,11 @@ fi exit 0 %changelog +* Sun Sep 22 2019 Terje Rosten - 5.5.10-7 +- Drop buildroot prefix in nm_dispatcher_dir macro +- Fix wrong path for gem in puppetet_gem.rb (rhbz#1751385), + report and fix from Lucien Weller, thanks! + * Thu Aug 22 2019 Lubomir Rintel - 5.5.10-6 - Move the NetworkManager dispatcher script out of /etc