- rel 5

- merge systemd stuff into main package

Changed files:
    NetworkManager.spec -> 1.103

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 6ff36d67fbdfc37b1cba9da5c57dfa6665b5b021..a3731330b4e22129257f527002d2e6ae88382ba1 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -8,7 +8,7 @@ Summary:        Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
 Version:       0.9.2.0
-Release:       4
+Release:       5
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
@@ -54,10 +54,12 @@ Requires:   dhcp-client
 Requires:      filesystem >= 3.0-37
 Requires:      polkit >= 0.97
 Requires:      rc-scripts >= 0.4.3.0
+Requires:      systemd-units >= 37-0.10
 Requires:      wpa_supplicant >= 0.7.3-4
 Suggests:      ModemManager
 Suggests:      mobile-broadband-provider-info
 Obsoletes:     dhcdbd < 3.0-1
+Obsoletes:     NetworkManager-systemd
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,19 +84,6 @@ libnm-glib library API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki libnm-glib.
 
-%package systemd
-Summary:       systemd units for Network Manager
-Summary(pl.UTF-8):     Jednostki systemd dla Network Managera
-Group:         Base
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      systemd-units >= 37-0.10
-
-%description systemd
-systemd units for Network Manager.
-
-%description systemd -l pl.UTF-8
-Jednostki systemd dla Network Managera.
-
 %package libs
 Summary:       Network Manager shared libraries
 Summary(pl.UTF-8):     Biblioteki dzielone Network Managera
@@ -223,15 +212,18 @@ exit 0
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%post systemd
+%post
 %systemd_post NetworkManager.service NetworkManager-wait-online.service
 
-%preun systemd
+%preun
 %systemd_preun NetworkManager.service NetworkManager-wait-online.service
 
-%postun systemd
+%postun
 %systemd_reload
 
+%triggerpostun -- NetworkManager < 2:0.9.2.0-5
+%systemd_trigger NetworkManager.service NetworkManager-wait-online.service
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
@@ -248,6 +240,9 @@ 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
+%{systemdunitdir}/NetworkManager.service
+%{systemdunitdir}/NetworkManager-wait-online.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
 /usr/lib/tmpfiles.d/%{name}.conf
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/gdb-cmd
@@ -278,12 +273,6 @@ exit 0
 %{_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.*.*.*