X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager.spec;h=df334054d12bb9bff411788f4c54bf4e8b2db74b;hb=refs%2Fheads%2Fmaster;hp=2a5b9f87e0b884713063b580451e8b6a397bda70;hpb=465502c59403c1e438fe642094edf472919bd388;p=packages%2FNetworkManager.git diff --git a/NetworkManager.spec b/NetworkManager.spec index 2a5b9f8..cc1bc49 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -1,25 +1,27 @@ +# TODO: package /usr/lib/firewalld/zones/nm-shared.xml for firewalld support # # Conditional build -%bcond_without systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime) -%bcond_without vala # Vala API +%bcond_without static_libs # static library +%bcond_without systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime) +%bcond_without vala # Vala API +%bcond_with firewalld # Firewalld zone for shared mode +%bcond_with default_iwd # use IWD as deafult Wi-Fi backend instead of wpa_supplicant Summary: Network Manager for GNOME Summary(pl.UTF-8): Zarządca sieci dla GNOME Name: NetworkManager -Version: 1.20.0 +Version: 1.48.0 Release: 1 Epoch: 2 License: GPL v2+ Group: Networking/Admin -Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/%{name}-%{version}.tar.xz -# Source0-md5: 109df9b0813755a98735206f5b2d68da +Source0: https://download.gnome.org/sources/NetworkManager/1.48/%{name}-%{version}.tar.xz +# Source0-md5: ba52091831d0d68122933a494507986a Source1: %{name}.conf Source3: %{name}.tmpfiles Source4: %{name}.init Patch0: ifcfg-path.patch -Patch1: %{name}-sh.patch -Patch2: systemd-fallback.patch -Patch3: %{name}-gtkdoc.patch +Patch1: systemd-fallback.patch URL: https://wiki.gnome.org/Projects/NetworkManager BuildRequires: ModemManager-devel >= 1.0.0 BuildRequires: audit-libs-devel @@ -28,15 +30,14 @@ 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: gettext-tools >= 0.17 -BuildRequires: glib2-devel >= 1:2.38.0 +BuildRequires: docbook-dtd412-xml +BuildRequires: gettext-tools >= 0.19.8 +BuildRequires: glib2-devel >= 1:2.42 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 >= 2.5 +BuildRequires: jansson-devel >= 2.7 BuildRequires: libndp-devel BuildRequires: libnl-devel >= 3.2.8 BuildRequires: libpsl-devel >= 0.1 @@ -51,10 +52,12 @@ BuildRequires: nss-devel >= 3.11 BuildRequires: perl-base BuildRequires: pkgconfig BuildRequires: polkit-devel >= 0.97 -BuildRequires: ppp-plugin-devel >= 3:2.4.6 -BuildRequires: python-pygobject3 +BuildRequires: ppp-plugin-devel >= 3:2.4.9 +BuildRequires: python3 >= 1:3 +BuildRequires: python3-pygobject3 BuildRequires: readline-devel -BuildRequires: rpmbuild(macros) >= 1.673 +BuildRequires: rpm-build >= 4.6 +BuildRequires: rpmbuild(macros) >= 1.752 BuildRequires: sed >= 4.0 %{?with_systemd:BuildRequires: systemd-devel >= 1:209} BuildRequires: tar >= 1:1.22 @@ -72,7 +75,7 @@ Requires: ConsoleKit-x11 Requires: curl-libs >= 7.24.0 Requires: dhcp-client Requires: filesystem >= 3.0-37 -Requires: jansson >= 2.5 +Requires: jansson >= 2.7 Requires: libnl >= 3.2.8 Requires: libpsl >= 0.1 Requires: libteamdctl >= 1.9 @@ -80,15 +83,14 @@ 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 >= 1.0.0 +%{?with_default_iwd:Suggests: iwd} Suggests: mobile-broadband-provider-info Suggests: resolvconf Suggests: teamd >= 1.9 -Obsoletes: NetworkManager-systemd +%{!?with_default_iwd:Suggests: wpa_supplicant >= 0.7.3-4} +Obsoletes: NetworkManager-systemd < 2:0.9.2.0-5 Obsoletes: dhcdbd < 3.0-1 -# sr@Latn vs. sr@latin -Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define plugindir %{_libdir}/NetworkManager @@ -105,9 +107,7 @@ Summary: libnm library API documentation Summary(pl.UTF-8): Dokumentacja API biblioteki libnm Group: Documentation Requires: gtk-doc-common -%if "%{_rpmversion}" >= "5" BuildArch: noarch -%endif %description apidocs libnm library API documentation. @@ -119,8 +119,7 @@ Dokumentacja API biblioteki libnm. Summary: Network Manager shared libraries Summary(pl.UTF-8): Biblioteki dzielone Network Managera Group: Libraries -Requires: dbus-glib >= 0.100 -Requires: glib2 >= 1:2.38.0 +Requires: glib2 >= 1:2.42 Requires: nss >= 3.11 Requires: udev-libs >= 1:175 Conflicts: NetworkManager < 0.6.4-0.2 @@ -136,8 +135,7 @@ Summary: Network Manager includes and more Summary(pl.UTF-8): Pliki nagłówkowe Network Managera Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: dbus-glib-devel >= 0.100 -Requires: glib2-devel >= 1:2.38.0 +Requires: glib2-devel >= 1:2.42 Requires: libuuid-devel Requires: nss-devel >= 3.11 @@ -165,9 +163,7 @@ 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. @@ -180,10 +176,8 @@ 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" +Requires: bash-completion >= 1:2.0 BuildArch: noarch -%endif %description -n bash-completion-NetworkManager Bash completion for NetworkManager command (nmcli). @@ -194,30 +188,41 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli). %prep %setup -q %patch0 -p1 -%patch1 -p1 -%{?with_systemd:%patch2 -p1} -%patch3 -p1 +%{?with_systemd:%patch1 -p1} + +grep -rl /usr/bin/env examples | xargs sed -i -e '1{ + s,^#!.*bin/env gjs,#!/usr/bin/gjs, + s,^#!.*bin/env lua,#!%{__lua}, + s,^#!.*bin/env python,#!%{__python3}, + s,^#!.*bin/env ruby,#!%{__ruby}, +}' + +%{__sed} -i -e '/^po\/Makefile\.in/d' configure.ac %build %{__gtkdocize} -%{__intltoolize} +%{__gettextize} %{__libtoolize} %{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} %configure \ + --disable-autotools-deprecation \ --enable-gtk-doc \ --enable-ifcfg-rh \ --enable-more-warnings \ --disable-silent-rules \ - --enable-static \ + %{__enable_disable static_libs static} \ %{!?with_vala:--disable-vala} \ + --with-config-wifi-backend-default=%{?with_default_iwd:iwd}%{!?with_default_iwd:wpa_supplicant} \ --with-dhclient=/sbin/dhclient \ --with-dhcpcd=/sbin/dhcpcd \ + %{!?with_firewalld:--disable-firewalld-zone} \ --with-html-dir=%{_gtkdocdir} \ --with-iptables=/usr/sbin/iptables \ --with-iwd=yes \ + --with-nft=/usr/sbin/nft \ --with-nmcli \ --with-system-ca-path=/etc/certs \ --with-systemdsystemunitdir=%{systemdunitdir} \ @@ -249,8 +254,12 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf # Cleanup %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la -%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.{a,la} -%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.{a,la} +%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.la +%if %{with static_libs} +%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.a +%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.a +%endif %find_lang %{name} @@ -281,12 +290,13 @@ fi %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 +# < 0.7.0-0.svn4027.1: disable obsolete service +if /sbin/chkconfig --list | grep -q NetworkManagerDispatcher ; then + %service -q NetworkManagerDispatcher stop + /sbin/chkconfig --del NetworkManagerDispatcher +fi +# < 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 @@ -296,7 +306,7 @@ exit 0 %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README TODO +%doc AUTHORS ChangeLog NEWS README.md TODO %attr(755,root,root) %{_bindir}/nm-online %attr(755,root,root) %{_bindir}/nmcli %attr(755,root,root) %{_bindir}/nmtui @@ -315,12 +325,14 @@ exit 0 %attr(755,root,root) %{distplugindir}/libnm-ppp-plugin.so %attr(755,root,root) %{distplugindir}/libnm-settings-plugin-ifcfg-rh.so %attr(755,root,root) %{distplugindir}/libnm-wwan.so +%attr(755,root,root) %{_libexecdir}/nm-cloud-setup +%attr(755,root,root) %{_libexecdir}/nm-daemon-helper %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) %{_libexecdir}/nm-ifdown %attr(755,root,root) %{_libexecdir}/nm-ifup %attr(755,root,root) %{_libexecdir}/nm-initrd-generator +%attr(755,root,root) %{_libexecdir}/nm-priv-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" @@ -328,13 +340,27 @@ exit 0 %endif %dir %{_prefix}/lib/NetworkManager/VPN %dir %{_prefix}/lib/NetworkManager/conf.d +%dir %{_prefix}/lib/NetworkManager/dispatcher.d +%{_prefix}/lib/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh +%dir %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d +%attr(755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh +%dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d +%attr(755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d/90-nm-cloud-setup.sh %{systemdunitdir}/NetworkManager.service %{systemdunitdir}/NetworkManager-dispatcher.service %{systemdunitdir}/NetworkManager-wait-online.service %dir %{systemdunitdir}/NetworkManager.service.d %{systemdunitdir}/NetworkManager.service.d/NetworkManager-ovs.conf +%{systemdunitdir}/nm-cloud-setup.service +%{systemdunitdir}/nm-cloud-setup.timer +%{systemdunitdir}/nm-priv-helper.service %{systemdtmpfilesdir}/%{name}.conf %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service +%{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service +%{_datadir}/dbus-1/system.d/nm-dispatcher.conf +%{_datadir}/dbus-1/system.d/nm-ifcfg-rh.conf +%{_datadir}/dbus-1/system.d/nm-priv-helper.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf %{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy /lib/udev/rules.d/84-nm-drivers.rules /lib/udev/rules.d/85-nm-unmanaged.rules @@ -349,9 +375,6 @@ exit 0 %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-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(711,root,root) %dir /var/run/%{name} %attr(700,root,root) %dir /var/lib/%{name} %{_mandir}/man1/nm-online.1* @@ -361,13 +384,18 @@ exit 0 %{_mandir}/man1/nmtui-hostname.1* %{_mandir}/man1/nmtui.1* %{_mandir}/man5/NetworkManager.conf.5* +%{_mandir}/man5/nm-settings.5* +%{_mandir}/man5/nm-settings-dbus.5* %{_mandir}/man5/nm-settings-ifcfg-rh.5* %{_mandir}/man5/nm-settings-keyfile.5* -%{_mandir}/man5/nm-settings.5* +%{_mandir}/man5/nm-settings-nmcli.5* %{_mandir}/man5/nm-system-settings.conf.5* %{_mandir}/man7/nm-openvswitch.7* %{_mandir}/man7/nmcli-examples.7* %{_mandir}/man8/NetworkManager.8* +%{_mandir}/man8/NetworkManager-dispatcher.8* +%{_mandir}/man8/NetworkManager-wait-online.service.8* +%{_mandir}/man8/nm-cloud-setup.8* %{_mandir}/man8/nm-initrd-generator.8* %{_examplesdir}/%{name}-%{version} @@ -391,9 +419,11 @@ exit 0 %{_datadir}/dbus-1/interfaces/org.freedesktop.NetworkManager.*.xml %{_datadir}/gir-1.0/NM-1.0.gir +%if %{with static_libs} %files static %defattr(644,root,root,755) %{_libdir}/libnm.a +%endif %if %{with vala} %files -n vala-NetworkManager