packages: NetworkManager/NetworkManager.spec - rel 5 - merge systemd stuff ...

[baggins]

Author: baggins                      Date: Sun Feb  5 15:57:46 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- merge systemd stuff into main package

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.102 -> 1.103) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.102 packages/NetworkManager/NetworkManager.spec:1.103
--- packages/NetworkManager/NetworkManager.spec:1.102	Tue Jan 31 12:53:32 2012
+++ packages/NetworkManager/NetworkManager.spec	Sun Feb  5 16:57:41 2012
@@ -9,7 +9,7 @@
 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
@@ -55,10 +55,12 @@
 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 at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -83,19 +85,6 @@
 %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
@@ -224,15 +213,18 @@
 %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
@@ -249,6 +241,9 @@
 %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
@@ -279,12 +274,6 @@
 %{_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.*.*.*
@@ -322,6 +311,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.103  2012/02/05 15:57:41  baggins
+- rel 5
+- merge systemd stuff into main package
+
 Revision 1.102  2012/01/31 11:53:32  baggins
 - release 4
 
================================================================

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