--- /dev/null
+--- NetworkManager-1.6.0/configure.ac.orig 2017-01-26 20:02:45.780051652 +0100
++++ NetworkManager-1.6.0/configure.ac 2017-01-26 20:04:46.173383613 +0100
+@@ -1125,7 +1125,7 @@
+ build_setting_docs=no
+ if test -n "$INTROSPECTION_MAKEFILE"; then
+ # If g-i is installed we know we have python, but we might not have pygobject
+- if ! "$PYTHON" -c 'from gi.repository import GObject' >& /dev/null; then
++ if ! "$PYTHON" -c 'from gi.repository import GObject' > /dev/null 2>&1; then
+ AC_MSG_ERROR(["--enable-introspection aims to build the settings documentation. This requires GObject introspection for python (pygobject)])
+ fi
+
Summary: Network Manager for GNOME
Summary(pl.UTF-8): Zarządca sieci dla GNOME
Name: NetworkManager
-Version: 1.4.4
+Version: 1.6.0
Release: 1
Epoch: 2
License: GPL v2+
Group: Networking/Admin
-Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/%{name}-%{version}.tar.xz
-# Source0-md5: 63f1e0d6d7e9099499d062c84c927a75
+Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/%{name}-%{version}.tar.xz
+# Source0-md5: ccdac1d03133a59065cbb93a09fa54b0
Source1: %{name}.conf
Source3: %{name}.tmpfiles
Source4: %{name}.init
Patch0: ifcfg-path.patch
-Patch1: systemd-fallback.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: 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
%prep
%setup -q
%patch0 -p1
-%{?with_systemd:%patch1 -p1}
+%patch1 -p1
+%{?with_systemd:%patch2 -p1}
%build
%{__gtkdocize}
%configure \
--disable-silent-rules \
--with-html-dir=%{_gtkdocdir} \
+ --enable-gtk-doc \
--enable-ifcfg-rh \
- --enable-more-warnings=yes \
+ --enable-more-warnings \
--with-dhclient=/sbin/dhclient \
--with-dhcpcd=/sbin/dhcpcd \
--with-iptables=/usr/sbin/iptables \
- --with-nmcli=yes \
+ --with-nmcli \
--with-system-ca-path=/etc/certs \
--with-systemdsystemunitdir=%{systemdunitdir} \
--with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
--with-resolvconf=/sbin/resolvconf \
--with-udev-dir=/lib/udev \
--with-dist-version=%{version}-%{release} \
- --with-docs \
--enable-static \
%{!?with_vala:--disable-vala}
%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
%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
%{_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
TODO: make it configurable via dist tag in configure.ac
---- NetworkManager-1.4.0/src/settings/plugins/ifcfg-rh/common.h.orig 2016-09-26 21:39:01.171161668 +0200
-+++ NetworkManager-1.4.0/src/settings/plugins/ifcfg-rh/common.h 2016-09-26 21:53:39.584484971 +0200
+--- NetworkManager-1.6.0/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h.orig 2017-01-26 19:50:33.226726682 +0100
++++ NetworkManager-1.6.0/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h 2017-01-26 19:50:44.573393224 +0100
@@ -36,7 +36,7 @@
#define AUGNEW_TAG ".augnew"
#define AUGTMP_TAG ".augtmp"
AC_ARG_WITH(suspend-resume, AS_HELP_STRING([--with-suspend-resume=upower|systemd|consolekit], [Build NetworkManager with specific suspend/resume support]))
if test "z$with_suspend_resume" = "z"; then
PKG_CHECK_EXISTS([libsystemd >= 209], [have_systemd_inhibit=yes],
---- NetworkManager-1.4.4/src/nm-session-monitor.c.orig 2016-12-15 20:38:53.000000000 +0100
-+++ NetworkManager-1.4.4/src/nm-session-monitor.c 2016-12-18 20:44:54.507822307 +0100
-@@ -30,6 +30,7 @@
- #include "NetworkManagerUtils.h"
+--- NetworkManager-1.6.0/src/nm-session-monitor.c.orig 2017-01-16 15:08:37.000000000 +0100
++++ NetworkManager-1.6.0/src/nm-session-monitor.c 2017-01-26 20:00:57.570052887 +0100
+@@ -29,6 +29,7 @@
+ #include <sys/stat.h>
#ifdef SESSION_TRACKING_SYSTEMD
+#include <systemd/sd-daemon.h>
#include <systemd/sd-login.h>
#endif
-@@ -52,13 +53,11 @@ struct _NMSessionMonitor {
+@@ -53,13 +54,11 @@ struct _NMSessionMonitor {
} sd;
#endif
};
struct _NMSessionMonitorClass {
-@@ -150,7 +149,6 @@ st_sd_finalize (NMSessionMonitor *monito
+@@ -132,7 +131,6 @@ st_sd_finalize (NMSessionMonitor *monito
- /********************************************************************/
+ /*****************************************************************************/
-#ifdef SESSION_TRACKING_CONSOLEKIT
typedef struct {
gboolean active;
} CkSession;
-@@ -284,7 +282,6 @@ ck_finalize (NMSessionMonitor *monitor)
+@@ -266,7 +264,6 @@ ck_finalize (NMSessionMonitor *monitor)
g_clear_pointer (&monitor->ck.cache, g_hash_table_unref);
g_clear_object (&monitor->ck.monitor);
}
-#endif /* SESSION_TRACKING_CONSOLEKIT */
- /********************************************************************/
+ /*****************************************************************************/
-@@ -356,13 +353,16 @@ nm_session_monitor_session_exists (NMSes
+@@ -338,13 +335,16 @@ nm_session_monitor_session_exists (NMSes
g_return_val_if_fail (NM_IS_SESSION_MONITOR (self), FALSE);
#ifdef SESSION_TRACKING_SYSTEMD
#endif
return FALSE;
-@@ -374,25 +374,31 @@ static void
+@@ -356,26 +356,27 @@ static void
nm_session_monitor_init (NMSessionMonitor *monitor)
{
#ifdef SESSION_TRACKING_SYSTEMD
}
static void
- nm_session_monitor_finalize (GObject *object)
+ finalize (GObject *object)
{
#ifdef SESSION_TRACKING_SYSTEMD
-- st_sd_finalize (NM_SESSION_MONITOR (object));
-+ if (sd_booted () > 0) {
-+ st_sd_finalize (NM_SESSION_MONITOR (object));
-+ } else {
++ if (sd_booted () > 0)
+ st_sd_finalize (NM_SESSION_MONITOR (object));
++ else
#endif
-
+-
-#ifdef SESSION_TRACKING_CONSOLEKIT
ck_finalize (NM_SESSION_MONITOR (object));
-+
-+#ifdef SESSION_TRACKING_SYSTEMD
-+ }
- #endif
+-#endif
- if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
+ G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object);
+ }
--- NetworkManager-1.4.0/src/nm-sleep-monitor.c.orig 2016-08-24 15:09:03.000000000 +0200
+++ NetworkManager-1.4.0/src/nm-sleep-monitor.c 2016-09-27 16:43:07.397044526 +0200
@@ -26,6 +26,10 @@