# 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: 1.0.10
-Release: 3
+Version: 1.10.2
+Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/%{name}-%{version}.tar.xz
-# Source0-md5: a8f54460a4708efd840358f32d0968fd
+Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.10/%{name}-%{version}.tar.xz
+# Source0-md5: 42d83efdff7f23381c0971981222b491
Source1: %{name}.conf
Source3: %{name}.tmpfiles
Source4: %{name}.init
Patch0: ifcfg-path.patch
-Patch1: systemd-fallback.patch
-Patch2: %{name}-openvpn.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.11
+BuildRequires: automake >= 1:1.12
BuildRequires: bluez-libs-devel >= 5.0
+BuildRequires: curl-devel >= 7.24.0
BuildRequires: dbus-devel >= 1.1.0
BuildRequires: dbus-glib-devel >= 0.100
-BuildRequires: docbook-dtd412-xml
BuildRequires: gettext-tools >= 0.17
-BuildRequires: glib2-devel >= 1:2.37.2
+BuildRequires: glib2-devel >= 1:2.38.0
BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk-doc >= 1.0
BuildRequires: gtk-doc-automake >= 1.0
BuildRequires: intltool >= 0.40.0
+BuildRequires: jansson-devel
BuildRequires: libndp-devel
BuildRequires: libnl-devel >= 3.2.8
+BuildRequires: libpsl-devel >= 0.1
BuildRequires: libselinux-devel
-BuildRequires: libsoup-devel >= 2.26.0
-BuildRequires: libteam-devel >= 1.9
+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 >= 0.97
BuildRequires: ppp-plugin-devel >= 3:2.4.6
-BuildRequires: rpm-pythonprov
+BuildRequires: python-pygobject3
+BuildRequires: readline-devel
BuildRequires: rpmbuild(macros) >= 1.673
BuildRequires: sed >= 4.0
-%{?with_systemd:BuildRequires: systemd-devel >= 1:200}
+%{?with_systemd:BuildRequires: systemd-devel >= 1:209}
BuildRequires: tar >= 1:1.22
-BuildRequires: udev-devel
-BuildRequires: udev-glib-devel >= 1:165
+BuildRequires: udev-devel >= 1:175
%{?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
%else
Requires: ConsoleKit-x11
%endif
+Requires: curl-libs >= 7.24.0
Requires: dhcp-client
Requires: filesystem >= 3.0-37
Requires: libnl >= 3.2.8
-Requires: libsoup >= 2.26.0
-Requires: libteam >= 1.9
+Requires: libpsl >= 0.1
+Requires: libteamdctl >= 1.9
+Requires: newt >= 0.52.15
Requires: polkit >= 0.97
Requires: rc-scripts >= 0.4.3.0
Requires: systemd-units >= 38
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
Summary(pl.UTF-8): Biblioteki dzielone Network Managera
Group: Libraries
Requires: dbus-glib >= 0.100
-Requires: glib2 >= 1:2.37.2
+Requires: glib2 >= 1:2.38.0
Requires: nss >= 3.11
-Requires: udev-glib >= 1:165
+Requires: udev-libs >= 1:175
Conflicts: NetworkManager < 0.6.4-0.2
%description libs
Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: dbus-glib-devel >= 0.100
-Requires: glib2-devel >= 1:2.37.2
+Requires: glib2-devel >= 1:2.38.0
Requires: libuuid-devel
Requires: nss-devel >= 3.11
-Requires: udev-glib-devel >= 1:165
%description devel
Network Manager includes and more.
%prep
%setup -q
%patch0 -p1
-%{?with_systemd:%patch1 -p1}
-%patch2 -p1
+%patch1 -p1
+%{?with_systemd:%patch2 -p1}
%build
%{__gtkdocize}
%{__autoheader}
%{__automake}
%configure \
- --disable-silent-rules \
- --with-html-dir=%{_gtkdocdir} \
+ --enable-gtk-doc \
--enable-ifcfg-rh \
- --enable-more-warnings=yes \
+ --enable-more-warnings \
+ --disable-silent-rules \
+ --enable-static \
+ %{!?with_vala:--disable-vala} \
--with-dhclient=/sbin/dhclient \
--with-dhcpcd=/sbin/dhcpcd \
+ --with-html-dir=%{_gtkdocdir} \
--with-iptables=/usr/sbin/iptables \
+ --with-nmcli \
--with-system-ca-path=/etc/certs \
--with-systemdsystemunitdir=%{systemdunitdir} \
--with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
--with-pppd-plugin-dir=%{_libdir}/pppd/plugins \
--with-pppoe=/usr/sbin/pppoe \
--with-resolvconf=/sbin/resolvconf \
- --with-dist-version=%{version}-%{release} \
- --with-docs \
- %{__enable_disable wimax} \
- --enable-static \
- %{!?with_vala:--disable-vala}
+ --with-udev-dir=/lib/udev \
+ --with-dist-version=%{version}-%{release}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{systemdtmpfilesdir}} \
- $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections}
+ $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
%find_lang %{name}
# examples
+%{__make} clean-checkPROGRAMS
+
install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-%{__make} clean \
- top_builddir=$(pwd) \
- -C $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name 'Makefile*' | xargs rm
%clean
rm -rf $RPM_BUILD_ROOT
%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-ovs.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) %{_libdir}/NetworkManager/libnm-wwan.so
-%attr(755,root,root) %{_libexecdir}/nm-avahi-autoipd.action
%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
+%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
+%dir %{systemdunitdir}/NetworkManager.service.d
+%{systemdunitdir}/NetworkManager.service.d/NetworkManager-ovs.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
%{systemdtmpfilesdir}/%{name}.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
/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-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/org.freedesktop.NetworkManager.conf
-%attr(700,root,root) %dir /var/run/%{name}
+%attr(711,root,root) %dir /var/run/%{name}
%attr(700,root,root) %dir /var/lib/%{name}
%{_mandir}/man1/nm-online.1*
%{_mandir}/man1/nmcli.1*
%{_mandir}/man5/nm-settings-keyfile.5*
%{_mandir}/man5/nm-settings.5*
%{_mandir}/man5/nm-system-settings.conf.5*
-%{_mandir}/man5/nmcli-examples.5*
+%{_mandir}/man7/nm-openvswitch.7*
+%{_mandir}/man7/nmcli-examples.7*
%{_mandir}/man8/NetworkManager.8*
%{_examplesdir}/%{name}-%{version}
%{_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
%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
projects / packages / NetworkManager.git / blobdiff