up to 1.16.0

[packages/NetworkManager.git] / NetworkManager.spec

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 9300c58578afd409fe316bab094b2e70d29048f2..4e37b46ca6b7cb1a3418182c27eeae0e4d71b8c7 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,20 +6,19 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       1.12.2
-Release:       3
+Version:       1.16.0
+Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.12/%{name}-%{version}.tar.xz
-# Source0-md5: 94d02b80b120f166927e6ef242b29a9b
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.16/%{name}-%{version}.tar.xz
+# Source0-md5: 10abacaafb162a67d2942adf03e7e9e4
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
 Patch0:                ifcfg-path.patch
 Patch1:                %{name}-sh.patch
 Patch2:                systemd-fallback.patch
-Patch3:                version.patch
 URL:           https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires: ModemManager-devel >= 1.0.0
 BuildRequires: audit-libs-devel
@@ -36,7 +35,7 @@ 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: jansson-devel >= 2.5
 BuildRequires: libndp-devel
 BuildRequires: libnl-devel >= 3.2.8
 BuildRequires: libpsl-devel >= 0.1
@@ -71,6 +70,7 @@ Requires:     ConsoleKit-x11
 Requires:      curl-libs >= 7.24.0
 Requires:      dhcp-client
 Requires:      filesystem >= 3.0-37
+Requires:      jansson >= 2.5
 Requires:      libnl >= 3.2.8
 Requires:      libpsl >= 0.1
 Requires:      libteamdctl >= 1.9
@@ -194,7 +194,6 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %patch0 -p1
 %patch1 -p1
 %{?with_systemd:%patch2 -p1}
-%patch3 -p1
 
 %build
 %{__gtkdocize}
@@ -205,6 +204,7 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %{__autoheader}
 %{__automake}
 %configure \
+       --enable-config-plugin-ibft \
        --enable-gtk-doc \
        --enable-ifcfg-rh \
        --enable-more-warnings \
@@ -321,6 +321,7 @@ exit 0
 %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) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
 %if "%{_lib}" != "lib"
@@ -333,7 +334,6 @@ exit 0
 %{systemdunitdir}/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
 %{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy
@@ -369,6 +369,7 @@ exit 0
 %{_mandir}/man7/nm-openvswitch.7*
 %{_mandir}/man7/nmcli-examples.7*
 %{_mandir}/man8/NetworkManager.8*
+%{_mandir}/man8/nm-initrd-generator.8*
 %{_examplesdir}/%{name}-%{version}
 
 %files apidocs