-%{_datadir}/gnome/autostart/*.desktop
-%{_mandir}/man1/*
-%{_sysconfdir}/dbus-1/system.d/*
-%{_iconsdir}/*/*/apps/*.png
-
-%if 0
-/usr/include/NetworkManager/NetworkManager.h
-/usr/include/NetworkManager/NetworkManagerVPN.h
-/usr/include/NetworkManager/cipher-wep-ascii.h
-/usr/include/NetworkManager/cipher-wep-hex.h
-/usr/include/NetworkManager/cipher-wep-passphrase.h
-/usr/include/NetworkManager/cipher-wpa-psk-hex.h
-/usr/include/NetworkManager/cipher-wpa-psk-passphrase.h
-/usr/include/NetworkManager/cipher.h
-/usr/include/NetworkManager/dbus-helpers.h
-/usr/include/NetworkManager/dbus-method-dispatcher.h
-/usr/include/NetworkManager/libnm_glib.h
-/usr/include/NetworkManager/nm-vpn-ui-interface.h
-/usr/lib/libnm-util.a
-/usr/lib/libnm-util.la
-/usr/lib/libnm_glib.a
-/usr/lib/libnm_glib.la
-/usr/lib/pkgconfig/NetworkManager.pc
-/usr/lib/pkgconfig/libnm-util.pc
-/usr/lib/pkgconfig/libnm_glib.pc
-%endif
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
+%{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy
+/lib/udev/rules.d/77-nm-olpc-mesh.rules
+%dir %{_sysconfdir}/%{name}/VPN
+%dir %{_sysconfdir}/%{name}/system-connections
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
+%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
+%attr(700,root,root) %dir /var/run/%{name}
+%attr(700,root,root) %dir /var/lib/%{name}
+%{_mandir}/man1/nm-online.1*
+%{_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*
+%{_examplesdir}/%{name}-%{version}
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/NetworkManager
+%{_gtkdocdir}/libnm-glib
+%{_gtkdocdir}/libnm-util
+
+%files systemd
+%defattr(644,root,root,755)
+%{systemdunitdir}/NetworkManager.service
+%{systemdunitdir}/NetworkManager-wait-online.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnm-util.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnm-util.so.2
+%attr(755,root,root) %{_libdir}/libnm-glib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnm-glib.so.4
+%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnm-glib-vpn.so.1
+%{_libdir}/girepository-1.0/NMClient-1.0.typelib
+%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnm-util.so
+%attr(755,root,root) %{_libdir}/libnm-glib.so
+%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so
+%{_includedir}/NetworkManager
+%{_includedir}/libnm-glib
+%{_pkgconfigdir}/NetworkManager.pc
+%{_pkgconfigdir}/libnm-util.pc
+%{_pkgconfigdir}/libnm-glib-vpn.pc
+%{_pkgconfigdir}/libnm-glib.pc
+%{_datadir}/gir-1.0/NMClient-1.0.gir
+%{_datadir}/gir-1.0/NetworkManager-1.0.gir
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libnm-util.a
+%{_libdir}/libnm-glib.a
+%{_libdir}/libnm-glib-vpn.a