[puppet/el6] Fix NetworkManager dispatcher.d installation (#1050139)

Sam Kottler skottler at fedoraproject.org
Sat Feb 8 20:57:20 UTC 2014


commit e663381879cdeca2407d0e63e5fdfacce87f5c54
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sat Feb 8 17:14:10 2014 +0100

    Fix NetworkManager dispatcher.d installation (#1050139)

 puppet.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/puppet.spec b/puppet.spec
index fdaf5c6..936733f 100644
--- a/puppet.spec
+++ b/puppet.spec
@@ -13,12 +13,13 @@
 
 Name:           puppet
 Version:        2.7.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Vendor:         %{?_host_vendor}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
 Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
+Source1:        puppet-nm-dispatcher
 
 Group:          System Environment/Base
 
@@ -122,7 +123,7 @@ install -Dp -m0644 %{confdir}/logrotate %{buildroot}%{_sysconfdir}/logrotate.d/p
 
 # Install a NetworkManager dispatcher script to pickup changes to
 # /etc/resolv.conf and such (https://bugzilla.redhat.com/532085).
-install -Dpv %{SOURCE0} \
+install -Dpv %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/98-%{name}
 
 # We need something for these ghosted files, otherwise rpmbuild
@@ -318,6 +319,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed Jan 08 2014 Todd Zullinger <tmz at pobox.com> - 2.7.25-2
+- Fix NetworkManager dispatcher.d installation (#1050139)
+
 * Tue Jan 7 2014 Sam Kottler <skottler at fedoraproject.org> - 2.7.25-1
 - Update to 2.7.25 to fix the default file mode (#1049274)
 


More information about the scm-commits mailing list