Author: megabajt Date: Mon Jan 23 23:53:42 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- added post/preun/postun macros for -systemd subpackage
- added pl for -systemd
---- Files affected:
packages/NetworkManager:
NetworkManager.spec (1.96 -> 1.97)
---- Diffs:
================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.96
packages/NetworkManager/NetworkManager.spec:1.97
--- packages/NetworkManager/NetworkManager.spec:1.96 Thu Dec 1 02:18:48 2011
+++ packages/NetworkManager/NetworkManager.spec Tue Jan 24 00:53:37 2012
@@ -40,7 +40,7 @@
BuildRequires: polkit-devel >= 0.97
BuildRequires: ppp-plugin-devel >= 3:%{ppp_version}
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.450
+BuildRequires: rpmbuild(macros) >= 1.629
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
@@ -84,12 +84,17 @@
%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
@@ -156,7 +161,7 @@
--with-dhclient=/sbin/dhclient \
--with-iptables=/usr/sbin/iptables \
--with-system-ca-path=/etc/certs \
- --with-systemdsystemunitdir=/lib/systemd/system \
+ --with-systemdsystemunitdir=%{systemdunitdir} \
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
--with-dist-version=%{version}-%{release} \
--with-docs \
@@ -215,6 +220,15 @@
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+%post systemd
+%systemd_post NetworkManager.service NetworkManager-wait-online.service
+
+%preun systemd
+%systemd_preun NetworkManager.service NetworkManager-wait-online.service
+
+%postun systemd
+%systemd_reload
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
@@ -262,8 +276,8 @@
%files systemd
%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size)
/lib/systemd/system/NetworkManager.service
-%config(noreplace) %verify(not md5 mtime size)
/lib/systemd/system/NetworkManager-wait-online.service
+%{systemdunitdir}/NetworkManager.service
+%{systemdunitdir}/NetworkManager-wait-online.service
%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
%files libs
@@ -303,6 +317,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.97 2012/01/23 23:53:37 megabajt
+- added post/preun/postun macros for -systemd subpackage
+- added pl for -systemd
+
Revision 1.96 2011/12/01 01:18:48 cactus
- rel 2; systemd subpackage
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.96&r2=1.97&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
