packages: NetworkManager/NetworkManager.spec - install tmpfiles config in /etc

baggins baggins at pld-linux.org
Mon Jan 30 00:34:28 CET 2012


Author: baggins                      Date: Sun Jan 29 23:34:28 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install tmpfiles config in /etc

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.98 -> 1.99) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.98 packages/NetworkManager/NetworkManager.spec:1.99
--- packages/NetworkManager/NetworkManager.spec:1.98	Mon Jan 30 00:23:34 2012
+++ packages/NetworkManager/NetworkManager.spec	Mon Jan 30 00:34:23 2012
@@ -173,7 +173,7 @@
 
 %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 \
@@ -184,7 +184,7 @@
 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
@@ -249,6 +249,7 @@
 %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
@@ -264,7 +265,6 @@
 %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*
@@ -322,6 +322,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.99  2012/01/29 23:34:23  baggins
+- install tmpfiles config in /etc
+
 Revision 1.98  2012/01/29 23:23:34  baggins
 - rel 3
 - added tmpfiles config for systemd
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.98&r2=1.99&f=u



More information about the pld-cvs-commit mailing list