- rel 2; systemd subpackage

[packages/NetworkManager.git] / NetworkManager.spec

diff --git a/NetworkManager.spec b/NetworkManager.spec
index e124dbf2b0c3ebe17c1266d975518200cb16bc71..2c2282f5137e46744beca3d69867a8106099eda9 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,24 +1,23 @@
-
+#
 # Conditional build
 %bcond_with    wimax   # enable wimax support
-
+#
 %define                ppp_version     2.4.5
 
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       0.8.9997
-Release:       3
+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.8/%{name}-%{version}.tar.bz2
-# official NetworkManager with changes from f15 branch
-# (provides org.freedesktop.NetworkManagerCompat interface for KDE)
-Source0:       %{name}-%{version}-compat.tar.bz2
-# Source0-md5: 7a7fab2336c24b5cafa371782674fc06
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/%{name}-%{version}.tar.xz
+# Source0-md5: d7dce01e97758253bc4ed81d7b86045f
 Source1:       %{name}.conf
-Source2:       NetworkManager.upstart
+Source2:       %{name}.upstart
 Patch0:                %{name}-pld.patch
+Patch1:                ifcfg-path.patch
 URL:           http://projects.gnome.org/NetworkManager/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
@@ -28,29 +27,31 @@ BuildRequires:      docbook-dtd412-xml
 BuildRequires: gettext-devel >= 0.17
 BuildRequires: glib2-devel >= 1:2.24.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
-BuildRequires: gtk-doc
+BuildRequires: gtk-doc >= 1.0
 BuildRequires: gtk-doc-automake >= 1.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libiw-devel >= 1:28-0.pre9.1
-BuildRequires: libnl1-devel >= 1.1
-BuildRequires: libtool >= 2.2
+BuildRequires: libnl-devel >= 3.0
+BuildRequires: libtool >= 2:2.2
 BuildRequires: libuuid-devel
 BuildRequires: nss-devel >= 3.11
 BuildRequires: pkgconfig
-BuildRequires: polkit-devel
+BuildRequires: polkit-devel >= 0.97
 BuildRequires: ppp-plugin-devel >= 3:%{ppp_version}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.450
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
 BuildRequires: udev-glib-devel >= 147
 %{?with_wimax:BuildRequires:   wimax-devel >= 1.5.1}
+BuildRequires: xz
 Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      ConsoleKit-x11
 Requires:      dhcp-client
 Requires:      filesystem >= 3.0-37
-Requires:      polkit
+Requires:      polkit >= 0.97
 Requires:      rc-scripts >= 0.4.3.0
 Requires:      wpa_supplicant >= 0.7.3-4
 Suggests:      ModemManager
@@ -80,12 +81,22 @@ 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
 Group:         Libraries
 Requires:      dbus-glib >= 0.75
 Requires:      glib2 >= 1:2.24.0
+Requires:      nss >= 3.11
+Requires:      udev-glib >= 147
 Conflicts:     NetworkManager < 0.6.4-0.2
 
 %description libs
@@ -98,11 +109,12 @@ Biblioteki dzielone Network Managera.
 Summary:       Network Manager includes and more
 Summary(pl.UTF-8):     Pliki nagłówkowe Network Managera
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      dbus-glib-devel >= 0.75
 Requires:      glib2-devel >= 1:2.24.0
 Requires:      libuuid-devel
-Requires:      udev-glib-devel
+Requires:      nss-devel >= 3.11
+Requires:      udev-glib-devel >= 147
 
 %description devel
 Network Manager includes and more.
@@ -114,7 +126,7 @@ Pliki nagłówkowe Network Manager.
 Summary:       Network Manager static libraries
 Summary(pl.UTF-8):     Statyczne biblioteki Network Managera
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Network Manager static libraries.
@@ -125,6 +137,7 @@ Statyczne biblioteki Network Managera.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -142,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 \
@@ -191,6 +205,12 @@ fi
 %service -q NetworkManagerDispatcher stop
 /sbin/chkconfig --del NetworkManagerDispatcher
 
+%triggerun -- NetworkManager < 0.8.9997-5
+# move network interfaces description files to new location
+mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
+mv -f /etc/sysconfig/network-scripts/keys-* /etc/sysconfig/interfaces
+exit 0
+
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
@@ -239,6 +259,12 @@ fi
 %{_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.*.*.*