packages: NetworkManager/NetworkManager.spec - removed _libexecdir abuse fo...

[qboosh]

Author: qboosh                       Date: Sun Sep 19 12:19:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed _libexecdir abuse for plugins (installed to pkglibdir, not libexecdir)
- somehow unified files order

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.68 packages/NetworkManager/NetworkManager.spec:1.69
--- packages/NetworkManager/NetworkManager.spec:1.68	Mon Aug 16 17:36:38 2010
+++ packages/NetworkManager/NetworkManager.spec	Sun Sep 19 14:19:48 2010
@@ -5,7 +5,7 @@
 Name:		NetworkManager
 Version:	0.8.1
 Release:	2
-License:	GPL v2
+License:	GPL v2+
 Group:		Networking/Admin
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{version}.tar.bz2
 # Source0-md5:	96e551149dda8f6e0a5621f77468ba79
@@ -138,8 +138,8 @@
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 # Cleanup
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/*.*.*/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/%{ppp_version}/*.{a,la}
 
 %find_lang %{name}
 
@@ -170,35 +170,35 @@
 %attr(755,root,root) %{_bindir}/nmcli
 %attr(755,root,root) %{_sbindir}/NetworkManager
 %dir %{_libdir}/NetworkManager
-%attr(755,root,root) %{_libexecdir}/nm-crash-logger
-%attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-keyfile.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so
 %attr(755,root,root) %{_libexecdir}/nm-avahi-autoipd.action
 %attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action
 %attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
-%attr(755,root,root) %{_libexecdir}/libnm-settings-plugin-keyfile.so
-%attr(755,root,root) %{_libexecdir}/libnm-settings-plugin-ifcfg-rh.so
+%attr(755,root,root) %{_libexecdir}/nm-crash-logger
+%attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/gdb-cmd
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
+%{_datadir}/polkit-1/actions/org.freedesktop.network-manager-settings.system.policy
 /lib/udev/rules.d/77-nm-olpc-mesh.rules
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/VPN
 %dir %{_sysconfdir}/%{name}/dispatcher.d
 %dir %{_sysconfdir}/%{name}/system-connections
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
-%dir %{_datadir}/%{name}
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dhcp-client.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-avahi-autoipd.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-ifcfg-rh.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf
 %dir /var/run/%{name}
-%{_datadir}/polkit-1/actions/org.freedesktop.network-manager-settings.system.policy
-%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
-%{_datadir}/%{name}/gdb-cmd
 %{_mandir}/man1/nm-tool.1*
 %{_mandir}/man1/nmcli.1*
 %{_mandir}/man5/nm-system-settings.conf.5*
 %{_mandir}/man5/NetworkManager.conf.5*
 %{_mandir}/man8/NetworkManager.8*
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dhcp-client.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-avahi-autoipd.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-ifcfg-rh.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf
 
 %files apidocs
 %defattr(644,root,root,755)
@@ -241,6 +241,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2010/09/19 12:19:48  qboosh
+- removed _libexecdir abuse for plugins (installed to pkglibdir, not libexecdir)
+- somehow unified files order
+
 Revision 1.68  2010/08/16 15:36:38  glen
 - changes from Przemo Firszt <przemo#firszt.eu> (untested):
   - Add ifcfg-rh plugin to NetworkManager,
================================================================

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