- updated to 1.48.0

diff --git a/NetworkManager.spec b/NetworkManager.spec
index df334054d12bb9bff411788f4c54bf4e8b2db74b..cc1bc49dc1e724322af9233f7cf09df8f26b3729 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -10,13 +10,13 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       1.46.0
+Version:       1.48.0
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       https://download.gnome.org/sources/NetworkManager/1.46/%{name}-%{version}.tar.xz
-# Source0-md5: 0594a237e7182341dd39cf465b1b60fe
+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
@@ -197,6 +197,7 @@ grep -rl /usr/bin/env examples | xargs sed -i -e '1{
        s,^#!.*bin/env ruby,#!%{__ruby},
 }'
 
+%{__sed} -i -e '/^po\/Makefile\.in/d' configure.ac
 
 %build
 %{__gtkdocize}
@@ -207,6 +208,7 @@ grep -rl /usr/bin/env examples | xargs sed -i -e '1{
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-autotools-deprecation \
        --enable-gtk-doc \
        --enable-ifcfg-rh \
        --enable-more-warnings \

diff --git a/systemd-fallback.patch b/systemd-fallback.patch
index f7d4da3f191c8191ba4ba2f9569ad768c3ebd5c8..e527239789771527f9c44aad34e13b806db2917a 100644 (file)
--- a/systemd-fallback.patch
+++ b/systemd-fallback.patch
@@ -101,9 +101,9 @@
  
      G_OBJECT_CLASS(nm_session_monitor_parent_class)->finalize(object);
  }
---- NetworkManager-1.34.0/src/core/nm-sleep-monitor.c.orig     2022-01-13 15:49:26.000000000 +0100
-+++ NetworkManager-1.34.0/src/core/nm-sleep-monitor.c  2022-01-13 21:09:37.908589909 +0100
-@@ -11,6 +11,10 @@
+--- NetworkManager-1.48.0/src/core/nm-power-monitor.c.orig     2024-05-31 13:23:57.000000000 +0200
++++ NetworkManager-1.48.0/src/core/nm-power-monitor.c  2024-06-01 08:21:35.884268446 +0200
+@@ -11,15 +11,19 @@
  #include <sys/stat.h>
  #include <gio/gunixfdlist.h>
  
@@ -114,9 +114,8 @@
  #include "libnm-glib-aux/nm-dbus-aux.h"
  #include "libnm-core-intern/nm-core-internal.h"
  #include "NetworkManagerUtils.h"
-@@ -24,9 +28,9 @@
  
- #elif defined(SUSPEND_RESUME_SYSTEMD) || defined(SUSPEND_RESUME_ELOGIND)
+ #if defined(SUSPEND_RESUME_SYSTEMD) || defined(SUSPEND_RESUME_ELOGIND)
  
 -#define SUSPEND_DBUS_NAME      "org.freedesktop.login1"
 -#define SUSPEND_DBUS_PATH      "/org/freedesktop/login1"
@@ -124,41 +123,21 @@
 +#define SD_SUSPEND_DBUS_NAME      "org.freedesktop.login1"
 +#define SD_SUSPEND_DBUS_PATH      "/org/freedesktop/login1"
 +#define SD_SUSPEND_DBUS_INTERFACE "org.freedesktop.login1.Manager"
- #define USE_UPOWER             0
  #if defined(SUSPEND_RESUME_SYSTEMD)
- #define _NMLOG_PREFIX_NAME "sleep-monitor-sd"
-@@ -36,6 +40,17 @@
+ #define _NMLOG_PREFIX_NAME "power-monitor-sd"
+ #else
+@@ -28,6 +32,10 @@
  
  #elif defined(SUSPEND_RESUME_CONSOLEKIT)
  
-+#define USE_UPOWER                      0
-+#define _NMLOG_PREFIX_NAME              "sleep-monitor-ck"
-+
-+#else
-+
-+#error define one of SUSPEND_RESUME_SYSTEMD, SUSPEND_RESUME_ELOGIND, SUSPEND_RESUME_CONSOLEKIT, or SUSPEND_RESUME_UPOWER
-+
 +#endif
 +
-+#if defined (SUSPEND_RESUME_SYSTEMD) || defined(SUSPEND_RESUME_CONSOLEKIT)
++#if defined (SUSPEND_RESUME_SYSTEMD) || defined (SUSPEND_RESUME_ELOGIND) || defined(SUSPEND_RESUME_CONSOLEKIT)
 + 
  /* ConsoleKit2 has added the same suspend/resume DBUS API that Systemd
   * uses. http://consolekit2.github.io/ConsoleKit2/#Manager.Inhibit
   */
-@@ -43,12 +58,6 @@
- #define SUSPEND_DBUS_NAME      "org.freedesktop.ConsoleKit"
- #define SUSPEND_DBUS_PATH      "/org/freedesktop/ConsoleKit/Manager"
- #define SUSPEND_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager"
--#define USE_UPOWER             0
--#define _NMLOG_PREFIX_NAME     "sleep-monitor-ck"
--
--#else
--
--#error define one of SUSPEND_RESUME_SYSTEMD, SUSPEND_RESUME_ELOGIND, SUSPEND_RESUME_CONSOLEKIT, or SUSPEND_RESUME_UPOWER
- 
- #endif
- 
-@@ -329,6 +338,20 @@ nm_sleep_monitor_init(NMSleepMonitor *se
+@@ -292,6 +300,20 @@ nm_power_monitor_init(NMPowerMonitor *se
  {
      self->inhibit_fd  = -1;
      self->cancellable = g_cancellable_new();