#
# Conditional build
%bcond_without systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
+%bcond_without vala # Vala API
%bcond_with wimax # enable wimax support
-
+#
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 0.9.4.0
-Release: 6
+Version: 0.9.8.8
+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: 66a54b51a4998c484613911b72a7e6ff
+# Source0-md5: bad2486578aa9f4d2f5c1c1446e8daf4
Source1: %{name}.conf
Source2: %{name}.upstart
Source3: %{name}.tmpfiles
-Patch0: %{name}-pld.patch
-Patch1: ifcfg-path.patch
-Patch2: systemd-fallback.patch
-Patch3: llh340.patch
-Patch4: 11-initialize-nm-remote-settings.patch
-Patch5: %{name}-nmcli.patch
+Source4: %{name}.init
+Patch0: ifcfg-path.patch
+Patch1: systemd-fallback.patch
+Patch2: llh340.patch
URL: http://projects.gnome.org/NetworkManager/
+BuildRequires: ModemManager-devel >= 1.0.0
BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.10
+BuildRequires: automake >= 1:1.11
BuildRequires: dbus-devel >= 1.1.0
-BuildRequires: dbus-glib-devel >= 0.75
+BuildRequires: dbus-glib-devel >= 0.94
BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-devel >= 0.17
BuildRequires: glib2-devel >= 1:2.24.0
BuildRequires: gtk-doc-automake >= 1.0
BuildRequires: intltool >= 0.40.0
BuildRequires: libiw-devel >= 1:28-0.pre9.1
-BuildRequires: libnl-devel >= 3.0
+BuildRequires: libnl-devel >= 3.2.7
BuildRequires: libsoup-devel >= 2.26.0
BuildRequires: libtool >= 2:2.2
BuildRequires: libuuid-devel
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.629
BuildRequires: sed >= 4.0
-%{?with_systemd:BuildRequires: systemd-devel}
+%{?with_systemd:BuildRequires: systemd-devel >= 183}
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
-BuildRequires: udev-glib-devel >= 1:147
+BuildRequires: udev-glib-devel >= 1:165
+%{?with_vala:BuildRequires: vala >= 2:0.17.1.24}
%{?with_wimax:BuildRequires: wimax-devel >= 1.5.1}
BuildRequires: xz
Requires(post,preun): /sbin/chkconfig
Requires(post,preun,postun): systemd-units >= 38
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%if %{with systemd}
+Suggests: ConsoleKit-x11
+%else
Requires: ConsoleKit-x11
+%endif
Requires: dhcp-client
Requires: filesystem >= 3.0-37
+Requires: libnl >= 3.2.7
Requires: polkit >= 0.97
+Requires: libsoup >= 2.26.0
Requires: rc-scripts >= 0.4.3.0
Requires: systemd-units >= 38
Requires: wpa_supplicant >= 0.7.3-4
-Suggests: ModemManager
+Suggests: ModemManager >= 1.0.0
Suggests: mobile-broadband-provider-info
+Suggests: resolvconf
Obsoletes: NetworkManager-systemd
Obsoletes: dhcdbd < 3.0-1
# sr@Latn vs. sr@latin
Summary: Network Manager shared libraries
Summary(pl.UTF-8): Biblioteki dzielone Network Managera
Group: Libraries
-Requires: dbus-glib >= 0.75
+Requires: dbus-glib >= 0.94
Requires: glib2 >= 1:2.24.0
Requires: nss >= 3.11
-Requires: udev-glib >= 1:147
+Requires: udev-glib >= 1:165
Conflicts: NetworkManager < 0.6.4-0.2
%description libs
Summary(pl.UTF-8): Pliki nagłówkowe Network Managera
Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: dbus-glib-devel >= 0.75
+Requires: dbus-glib-devel >= 0.94
Requires: glib2-devel >= 1:2.24.0
Requires: libuuid-devel
Requires: nss-devel >= 3.11
-Requires: udev-glib-devel >= 1:147
+Requires: udev-glib-devel >= 1:165
%description devel
Network Manager includes and more.
%description static -l pl.UTF-8
Statyczne biblioteki Network Managera.
+%package -n vala-NetworkManager
+Summary: Vala API for NetworkManager libraries
+Summary(pl.UTF-8): API języka Vala do bibliotek NetworkManagera
+Group: Development/Libraries
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Requires: vala >= 2:0.17.1.24
+
+%description -n vala-NetworkManager
+Vala API for NetworkManager libraries.
+
+%description -n vala-NetworkManager -l pl.UTF-8
+API języka Vala do bibliotek NetworkManagera.
+
+%package -n bash-completion-NetworkManager
+Summary: Bash completion for NetworkManager command (nmcli)
+Summary(pl.UTF-8): Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli)
+Group: Applications/Shells
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: bash-completion >= 2.0
+
+%description -n bash-completion-NetworkManager
+Bash completion for NetworkManager command (nmcli).
+
+%description -n bash-completion-NetworkManager -l pl.UTF-8
+Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%{?with_systemd:%patch2 -p1}
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%{?with_systemd:%patch1 -p1}
+%patch2 -p1
%build
%{__gtkdocize}
%configure \
--disable-silent-rules \
--with-html-dir=%{_gtkdocdir} \
- --with-distro=pld \
+ --enable-ifcfg-rh \
--enable-more-warnings=yes \
--with-dhclient=/sbin/dhclient \
--with-iptables=/usr/sbin/iptables \
--with-system-ca-path=/etc/certs \
--with-systemdsystemunitdir=%{systemdunitdir} \
--with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
+ --with-suspend-resume=%{?with_systemd:systemd}%{!?with_systemd:upower} \
--with-pppd-plugin-dir=%{_libdir}/pppd/plugins \
+ --with-resolvconf=/sbin/resolvconf \
--with-dist-version=%{version}-%{release} \
--with-docs \
%{__enable_disable wimax} \
- --enable-static
+ --enable-static \
+ %{!?with_vala:--disable-vala}
%{__make}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
install -d $RPM_BUILD_ROOT/etc/init
%attr(755,root,root) %{_libexecdir}/nm-avahi-autoipd.action
%attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action
%attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
-%attr(755,root,root) %{_libexecdir}/nm-crash-logger
%attr(755,root,root) %{_libdir}/pppd/plugins/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-dispatcher.service
%{systemdunitdir}/NetworkManager-wait-online.service
%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
%{systemdtmpfilesdir}/%{name}.conf
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/gdb-cmd
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy
/lib/udev/rules.d/77-nm-olpc-mesh.rules
%{_mandir}/man1/nm-online.1*
%{_mandir}/man1/nm-tool.1*
%{_mandir}/man1/nmcli.1*
+%{_mandir}/man5/nm-settings.5*
%{_mandir}/man5/nm-system-settings.conf.5*
%{_mandir}/man5/NetworkManager.conf.5*
%{_mandir}/man8/NetworkManager.8*
%{_libdir}/libnm-util.a
%{_libdir}/libnm-glib.a
%{_libdir}/libnm-glib-vpn.a
+
+%if %{with vala}
+%files -n vala-NetworkManager
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libnm-glib.deps
+%{_datadir}/vala/vapi/libnm-glib.vapi
+%{_datadir}/vala/vapi/libnm-util.deps
+%{_datadir}/vala/vapi/libnm-util.vapi
+%endif
+
+%files -n bash-completion-NetworkManager
+%defattr(644,root,root,755)
+%{_datadir}/bash-completion/completions/nmcli