+#
+# 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.7.2
+Version: 1.0.6
Release: 1
-License: GPL v2
+Epoch: 2
+License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/%{name}-%{version}.tar.bz2
-# Source0-md5: 8e4e69b2836d4849771d905cb9f16138
-Source1: %{name}-system-settings.conf
-Patch0: %{name}-pld.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/%{name}-%{version}.tar.xz
+# Source0-md5: 00f5f9ec69725a9f9b99366853c6f73e
+Source1: %{name}.conf
+Source3: %{name}.tmpfiles
+Source4: %{name}.init
+Patch0: ifcfg-path.patch
+Patch1: systemd-fallback.patch
URL: http://projects.gnome.org/NetworkManager/
-BuildRequires: PolicyKit-devel
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake >= 1:1.9
-BuildRequires: dbus-glib-devel >= 0.75
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.16.0
-BuildRequires: gtk-doc-automake
-BuildRequires: hal-devel >= 0.5.2
-BuildRequires: intltool >= 0.35.5
+BuildRequires: ModemManager-devel >= 1.0.0
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
+BuildRequires: bluez-libs-devel >= 5.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: 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: libiw-devel >= 1:28-0.pre9.1
-BuildRequires: libnl-devel >= 1:1.0-0.pre8.1
-BuildRequires: libtool
+BuildRequires: libndp-devel
+BuildRequires: libnl-devel >= 3.2.8
+BuildRequires: libselinux-devel
+BuildRequires: libsoup-devel >= 2.26.0
+BuildRequires: libteam-devel >= 1.9
+BuildRequires: libtool >= 2:2.2
BuildRequires: libuuid-devel
+BuildRequires: newt-devel >= 0.52.15
BuildRequires: nss-devel >= 3.11
BuildRequires: pkgconfig
-BuildRequires: ppp-plugin-devel >= 3:2.4.4-2
-BuildRequires: rpmbuild(macros) >= 1.450
+BuildRequires: polkit-devel >= 0.97
+BuildRequires: ppp-plugin-devel >= 3:2.4.6
+BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.673
BuildRequires: sed >= 4.0
+%{?with_systemd:BuildRequires: systemd-devel >= 1:200}
+BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
+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: %{name}-libs = %{version}-%{release}
-Requires: PolicyKit
+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: rc-scripts
-Requires: wpa_supplicant >= 0.6-2
+Requires: filesystem >= 3.0-37
+Requires: libnl >= 3.2.8
+Requires: libsoup >= 2.26.0
+Requires: libteam >= 1.9
+Requires: polkit >= 0.97
+Requires: rc-scripts >= 0.4.3.0
+Requires: systemd-units >= 38
+Requires: wpa_supplicant >= 0.7.3-4
+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
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.100
+Requires: glib2 >= 1:2.37.2
+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.72
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: dbus-glib-devel >= 0.100
+Requires: glib2-devel >= 1:2.37.2
Requires: libuuid-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
+
+%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
+%{?with_systemd:%patch1 -p1}
%build
+%{__gtkdocize}
%{__intltoolize}
%{__libtoolize}
%{__aclocal} -I m4
%{__autoheader}
%{__automake}
%configure \
+ --disable-silent-rules \
--with-html-dir=%{_gtkdocdir} \
- --with-distro=pld \
- --with-system-ca-path=/etc/certs
+ --enable-ifcfg-rh \
+ --enable-more-warnings=yes \
+ --with-dhclient=/sbin/dhclient \
+ --with-dhcpcd=/sbin/dhcpcd \
+ --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=/usr/sbin/pppd \
+ --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}
%{__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}}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{systemdtmpfilesdir}} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/nm-system-settings.conf
+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 -f $RPM_BUILD_ROOT%{_libexecdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.{a,la}
%find_lang %{name}
+# examples
+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
%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
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/nm-tool
+%attr(755,root,root) %{_bindir}/nm-online
+%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
-%attr(755,root,root) %{_sbindir}/nm-system-settings
%dir %{_libdir}/NetworkManager
-%attr(755,root,root) %{_libexecdir}/nm-crash-logger
-%attr(755,root,root) %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
+%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-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-client.action
-%attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
-%attr(755,root,root) %{_libexecdir}/libnm-settings-plugin-keyfile.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
-%attr(755,root,root) /lib/udev/nm-modem-probe
-/lib/udev/rules.d/77-nm-probe-modem-capabilities.rules
-/lib/udev/rules.d/77-nm-zte-port-types.rules
-%dir %{_sysconfdir}/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/VPN
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%dir %{_sysconfdir}/NetworkManager/system-connections
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/NetworkManager/nm-system-settings.conf
-%dir %{_datadir}/%{name}
-%dir /var/run/%{name}
-%{_datadir}/PolicyKit/policy/org.freedesktop.network-manager-settings.system.policy
-%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
+%{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}/%{name}/gdb-cmd
-%{_mandir}/man8/NetworkManager.8*
-%{_mandir}/man1/nm-tool.1*
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dhcp-client.conf
+%{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy
+/lib/udev/rules.d/85-nm-unmanaged.rules
+%dir %{_sysconfdir}/%{name}/VPN
+%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-system-settings.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.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(700,root,root) %dir /var/lib/%{name}
+%{_mandir}/man1/nm-online.1*
+%{_mandir}/man1/nmcli.1*
+%{_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}/man5/nmcli-examples.5*
+%{_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.1
-%attr(755,root,root) %{_libdir}/libnm_glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm_glib.so.0
-%attr(755,root,root) %{_libdir}/libnm_glib_vpn.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm_glib_vpn.so.0
+%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
-%{_libdir}/libnm-util.la
-%{_libdir}/libnm_glib.la
-%{_libdir}/libnm_glib_vpn.la
+%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
+%{_pkgconfigdir}/libnm-glib-vpn.pc
+%{_pkgconfigdir}/libnm-glib.pc
+%{_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
+%{_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)
+%{bash_compdir}/nmcli
projects / packages / NetworkManager.git / blobdiff