-
+#
# Conditional build
-%bcond_with wimax # enable wimax support
-
-%define ppp_version 2.4.5
+%bcond_without systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
+%bcond_without vala # Vala API
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 0.8.998
+Version: 1.6.2
Release: 1
+Epoch: 2
License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5: 600a4b538456be6f622567a2711a1bf1
+Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/%{name}-%{version}.tar.xz
+# Source0-md5: 89c975afe19fbac854191edb6e9bcd3b
Source1: %{name}.conf
-Patch0: %{name}-pld.patch
-URL: http://projects.gnome.org/NetworkManager/
+Source3: %{name}.tmpfiles
+Source4: %{name}.init
+Patch0: ifcfg-path.patch
+Patch1: %{name}-sh.patch
+Patch2: systemd-fallback.patch
+URL: https://wiki.gnome.org/Projects/NetworkManager
+BuildRequires: ModemManager-devel >= 1.0.0
+BuildRequires: audit-libs-devel
BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.10
+BuildRequires: automake >= 1:1.12
+BuildRequires: bluez-libs-devel >= 5.0
BuildRequires: dbus-devel >= 1.1.0
-BuildRequires: dbus-glib-devel >= 0.75
-BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.24.0
+BuildRequires: dbus-glib-devel >= 0.100
+BuildRequires: gettext-tools >= 0.17
+BuildRequires: glib2-devel >= 1:2.38.0
+BuildRequires: gnome-common
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: jansson-devel
+BuildRequires: libndp-devel
+BuildRequires: libnl-devel >= 3.2.8
+BuildRequires: libselinux-devel
+BuildRequires: libsoup-devel >= 2.40.0
+BuildRequires: libteamdctl-devel >= 1.9
+BuildRequires: libtool >= 2:2.2
BuildRequires: libuuid-devel
+BuildRequires: libxslt-progs
+BuildRequires: newt-devel >= 0.52.15
BuildRequires: nss-devel >= 3.11
+BuildRequires: perl-base
BuildRequires: pkgconfig
-BuildRequires: polkit-devel
-BuildRequires: ppp-plugin-devel >= 3:%{ppp_version}
-BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.450
+BuildRequires: polkit-devel >= 0.97
+BuildRequires: ppp-plugin-devel >= 3:2.4.6
+BuildRequires: python-pygobject3
+BuildRequires: readline-devel
+BuildRequires: rpmbuild(macros) >= 1.673
BuildRequires: sed >= 4.0
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
+BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
-BuildRequires: udev-glib-devel >= 147
-%{?with_wimax:BuildRequires: wimax-devel >= 1.5.1}
+BuildRequires: udev-glib-devel >= 1:165
+%{?with_vala:BuildRequires: vala >= 2:0.17.1.24}
+BuildRequires: xz
Requires(post,preun): /sbin/chkconfig
-Requires: %{name}-libs = %{version}-%{release}
-Requires: ConsoleKit
+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: polkit
+Requires: libnl >= 3.2.8
+Requires: libsoup >= 2.40.0
+Requires: libteamdctl >= 1.9
+Requires: newt >= 0.52.15
+Requires: polkit >= 0.97
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
+Suggests: teamd >= 1.9
+Obsoletes: NetworkManager-systemd
Obsoletes: dhcdbd < 3.0-1
# sr@Latn vs. sr@latin
Conflicts: glibc-misc < 6:2.7
Summary(pl.UTF-8): Dokumentacja API biblioteki libnm-glib
Group: Documentation
Requires: gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
%description apidocs
libnm-glib library API documentation.
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: dbus-glib >= 0.100
+Requires: glib2 >= 1:2.38.0
+Requires: nss >= 3.11
+Requires: udev-glib >= 1:165
Conflicts: NetworkManager < 0.6.4-0.2
%description libs
Summary: Network Manager includes and more
Summary(pl.UTF-8): Pliki nagłówkowe Network Managera
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: dbus-glib-devel >= 0.75
-Requires: glib2-devel >= 1:2.24.0
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: dbus-glib-devel >= 0.100
+Requires: glib2-devel >= 1:2.38.0
Requires: libuuid-devel
-Requires: udev-glib-devel
+Requires: nss-devel >= 3.11
+Requires: udev-glib-devel >= 1:165
%description devel
Network Manager includes and more.
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.
%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
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%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
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%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}
%build
+%{__gtkdocize}
%{__intltoolize}
%{__libtoolize}
%{__aclocal} -I m4
%configure \
--disable-silent-rules \
--with-html-dir=%{_gtkdocdir} \
- --with-distro=pld \
- --enable-more-warnings=yes \
+ --enable-gtk-doc \
+ --enable-ifcfg-rh \
+ --enable-more-warnings \
--with-dhclient=/sbin/dhclient \
+ --with-dhcpcd=/sbin/dhcpcd \
--with-iptables=/usr/sbin/iptables \
+ --with-nmcli \
--with-system-ca-path=/etc/certs \
- --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+ --with-systemdsystemunitdir=%{systemdunitdir} \
+ --with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
+ --with-suspend-resume=%{?with_systemd:systemd}%{!?with_systemd:upower} \
+ --with-pppd=/usr/sbin/pppd \
+ --with-pppd-plugin-dir=%{_libdir}/pppd/plugins \
+ --with-pppoe=/usr/sbin/pppoe \
+ --with-resolvconf=/sbin/resolvconf \
+ --with-udev-dir=/lib/udev \
--with-dist-version=%{version}-%{release} \
- --with-docs \
- %{__enable_disable wimax} \
- --enable-static
+ --enable-static \
+ %{!?with_vala:--disable-vala}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections}}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{systemdtmpfilesdir}} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,conf.d,dispatcher.d,dnsmasq.d,dnsmasq-shared.d,system-connections} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/{pre-down.d,pre-up.d,no-wait.d} \
+ $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/{VPN,conf.d}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
# Cleanup
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/%{ppp_version}/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.{a,la}
%find_lang %{name}
# examples
+%{__make} clean-checkPROGRAMS
+
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name 'Makefile*' | xargs rm
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/chkconfig --add NetworkManager
%service -n NetworkManager restart "NetworkManager daemon"
+%systemd_post NetworkManager.service NetworkManager-wait-online.service
%preun
if [ "$1" = "0" ]; then
%service NetworkManager stop
/sbin/chkconfig --del NetworkManager
fi
+%systemd_preun NetworkManager.service NetworkManager-wait-online.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- NetworkManager < 2:0.9.2.0-5
+%systemd_trigger NetworkManager.service NetworkManager-wait-online.service
%triggerun -- NetworkManager < 0.7.0-0.svn4027.1
%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
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/nm-online
-%attr(755,root,root) %{_bindir}/nm-tool
%attr(755,root,root) %{_bindir}/nmcli
+%attr(755,root,root) %{_bindir}/nmtui
+%attr(755,root,root) %{_bindir}/nmtui-connect
+%attr(755,root,root) %{_bindir}/nmtui-edit
+%attr(755,root,root) %{_bindir}/nmtui-hostname
%attr(755,root,root) %{_sbindir}/NetworkManager
%dir %{_libdir}/NetworkManager
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-adsl.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-bluetooth.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wifi.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wwan.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-team.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-ppp-plugin.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ibft.so
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so
-%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/%{ppp_version}/nm-pppd-plugin.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-wwan.so
+%attr(755,root,root) %{_libexecdir}/nm-dhcp-helper
+%attr(755,root,root) %{_libexecdir}/nm-dispatcher
+%attr(755,root,root) %{_libexecdir}/nm-iface-helper
+%attr(755,root,root) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
%attr(754,root,root) /etc/rc.d/init.d/NetworkManager
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/gdb-cmd
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib/NetworkManager
+%endif
+%dir %{_prefix}/lib/NetworkManager/VPN
+%dir %{_prefix}/lib/NetworkManager/conf.d
+%{systemdunitdir}/NetworkManager.service
+%{systemdunitdir}/NetworkManager-dispatcher.service
+%{systemdunitdir}/NetworkManager-wait-online.service
+# XXX: dir here or add to systemd-units?
+%dir %{systemdunitdir}/network-online.target.wants
+%{systemdunitdir}/network-online.target.wants/NetworkManager-wait-online.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+%{systemdtmpfilesdir}/%{name}.conf
%{_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
+/lib/udev/rules.d/84-nm-drivers.rules
+/lib/udev/rules.d/85-nm-unmanaged.rules
%dir %{_sysconfdir}/%{name}/VPN
+%dir %{_sysconfdir}/%{name}/conf.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-down.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d
+%dir %{_sysconfdir}/%{name}/dnsmasq.d
+%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
%dir %{_sysconfdir}/%{name}/system-connections
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dhcp-client.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-avahi-autoipd.conf
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-ifcfg-rh.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf
-%attr(700,root,root) %dir /var/run/%{name}
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+%attr(711,root,root) %dir /var/run/%{name}
%attr(700,root,root) %dir /var/lib/%{name}
%{_mandir}/man1/nm-online.1*
-%{_mandir}/man1/nm-tool.1*
%{_mandir}/man1/nmcli.1*
-%{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man1/nmtui-connect.1*
+%{_mandir}/man1/nmtui-edit.1*
+%{_mandir}/man1/nmtui-hostname.1*
+%{_mandir}/man1/nmtui.1*
%{_mandir}/man5/NetworkManager.conf.5*
+%{_mandir}/man5/nm-settings-ifcfg-rh.5*
+%{_mandir}/man5/nm-settings-keyfile.5*
+%{_mandir}/man5/nm-settings.5*
+%{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man7/nmcli-examples.7*
%{_mandir}/man8/NetworkManager.8*
%{_examplesdir}/%{name}-%{version}
%files apidocs
%defattr(644,root,root,755)
%{_gtkdocdir}/NetworkManager
+%{_gtkdocdir}/libnm
%{_gtkdocdir}/libnm-glib
%{_gtkdocdir}/libnm-util
%files libs
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnm.so.0
%attr(755,root,root) %{_libdir}/libnm-util.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libnm-util.so.2
%attr(755,root,root) %{_libdir}/libnm-glib.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libnm-glib.so.4
%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libnm-glib-vpn.so.1
+%{_libdir}/girepository-1.0/NM-1.0.typelib
%{_libdir}/girepository-1.0/NMClient-1.0.typelib
%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnm.so
%attr(755,root,root) %{_libdir}/libnm-util.so
%attr(755,root,root) %{_libdir}/libnm-glib.so
%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so
%{_includedir}/NetworkManager
+%{_includedir}/libnm
%{_includedir}/libnm-glib
%{_pkgconfigdir}/NetworkManager.pc
+%{_pkgconfigdir}/libnm.pc
%{_pkgconfigdir}/libnm-util.pc
%{_pkgconfigdir}/libnm-glib-vpn.pc
%{_pkgconfigdir}/libnm-glib.pc
+%{_datadir}/dbus-1/interfaces/org.freedesktop.NetworkManager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.NetworkManager.*.xml
+%{_datadir}/gir-1.0/NM-1.0.gir
%{_datadir}/gir-1.0/NMClient-1.0.gir
%{_datadir}/gir-1.0/NetworkManager-1.0.gir
%files static
%defattr(644,root,root,755)
+%{_libdir}/libnm.a
%{_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.deps
+%{_datadir}/vala/vapi/libnm.vapi
+%{_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)
+%{bash_compdir}/nmcli
projects / packages / NetworkManager.git / blobdiff