- rel 2; systemd subpackage

[packages/NetworkManager.git] / NetworkManager.spec

diff --git a/NetworkManager.spec b/NetworkManager.spec
index bc8da1928bcb7830d0a516662dd1f7f8bb1635b3..2c2282f5137e46744beca3d69867a8106099eda9 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,19 +7,17 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       0.9.1.90
-Release:       1
+Version:       0.9.2.0
+Release:       2
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/%{name}-%{version}.tar.xz
-# Source0-md5: c7cfb1c18c3673a8664cac3e404f5aa0
+# Source0-md5: d7dce01e97758253bc4ed81d7b86045f
 Source1:       %{name}.conf
 Source2:       %{name}.upstart
 Patch0:                %{name}-pld.patch
 Patch1:                ifcfg-path.patch
-Patch2:                libnl.patch
-Patch3:                libnl_noconflict.patch
 URL:           http://projects.gnome.org/NetworkManager/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
@@ -83,6 +81,14 @@ libnm-glib library API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki libnm-glib.
 
+%package systemd
+Summary:       systemd units for Network Manager
+Group:         Base
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+
+%description systemd
+systemd units for Network Manager.
+
 %package libs
 Summary:       Network Manager shared libraries
 Summary(pl.UTF-8):     Biblioteki dzielone Network Managera
@@ -132,8 +138,6 @@ Statyczne biblioteki Network Managera.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %{__gtkdocize}
@@ -151,6 +155,7 @@ Statyczne biblioteki Network Managera.
        --with-dhclient=/sbin/dhclient \
        --with-iptables=/usr/sbin/iptables \
        --with-system-ca-path=/etc/certs \
+       --with-systemdsystemunitdir=/lib/systemd/system \
        --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
        --with-dist-version=%{version}-%{release} \
        --with-docs \
@@ -254,6 +259,12 @@ exit 0
 %{_gtkdocdir}/libnm-glib
 %{_gtkdocdir}/libnm-util
 
+%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
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnm-util.so.*.*.*