From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 29 Jan 2012 23:34:23 +0000 (+0000)
Subject: - install tmpfiles config in /etc
X-Git-Tag: auto/th/NetworkManager-0_9_2_0-3~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2FNetworkManager.git;a=commitdiff_plain;h=976e1151bd0f0ca38ef6c8a6a093f828409d8a5d

- install tmpfiles config in /etc

Changed files:
    NetworkManager.spec -> 1.99
---

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 6c3fbbe..a1dbf7e 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -172,7 +172,7 @@ Statyczne biblioteki Network Managera.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},/usr/lib/tmpfiles.d} \
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},/etc/tmpfiles.d} \
 	$RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections}}
 
 %{__make} install \
@@ -183,7 +183,7 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install -d $RPM_BUILD_ROOT/etc/init
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/init/NetworkManager.conf
 
-install %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/tmpfiles.d/%{name}.conf
 
 # Cleanup
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -248,6 +248,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
 %config(noreplace) %verify(not md5 mtime size) /etc/init/NetworkManager.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/tmpfiles.d/%{name}.conf
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/gdb-cmd
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
@@ -263,7 +264,6 @@ exit 0
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf
 %attr(700,root,root) %dir /var/run/%{name}
 %attr(700,root,root) %dir /var/lib/%{name}
-/usr/lib/tmpfiles.d/%{name}.conf
 %{_mandir}/man1/nm-online.1*
 %{_mandir}/man1/nm-tool.1*
 %{_mandir}/man1/nmcli.1*