[packages/NetworkManager] Fix configuration dir path. Release 2

megabajt megabajt at pld-linux.org
Tue Jun 21 22:04:20 CEST 2016


commit 9551ee04c1b854d8a136b4f4aa91a27339f21603
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Tue Jun 21 21:59:45 2016 +0200

    Fix configuration dir path. Release 2

 NetworkManager.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 6da9217..02c69d3 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,7 +7,7 @@ Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
 Version:	1.2.2
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Admin
@@ -222,7 +222,7 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{systemdtmpfilesdir}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections} \
-	$RPM_BUILD_ROOT%{_libdir}/%{name}/VPN
+	$RPM_BUILD_ROOT%{_prefix}/lib/%{name}/{VPN,conf.d}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -306,7 +306,11 @@ exit 0
 %attr(755,root,root) %{_libexecdir}/nm-iface-helper
 %attr(755,root,root) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
-%dir %{_libdir}/NetworkManager/VPN
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib/NetworkManager
+%endif
+%dir %{_prefix}/lib/NetworkManager/VPN
+%dir %{_prefix}/lib/NetworkManager/conf.d
 %{systemdunitdir}/NetworkManager.service
 %{systemdunitdir}/NetworkManager-dispatcher.service
 %{systemdunitdir}/NetworkManager-wait-online.service
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager.git/commitdiff/9551ee04c1b854d8a136b4f4aa91a27339f21603



More information about the pld-cvs-commit mailing list