- rediffed ifcfg-path patch with fuzz 0

- added x32 patch (adjust syscall numbers for x32 ABI case)
- merge triggerun scripts for rpm.org
- release 2

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 9b3d9b930880e800c83c903fe3002d1d5fd0e5fd..7a4660ce3b15b6afeb5882c8701e3bf4862514d8 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,7 +9,7 @@ Summary:        Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
 Version:       1.28.0
-Release:       1
+Release:       2
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
@@ -19,6 +19,7 @@ Source1:      %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
 Patch0:                ifcfg-path.patch
+Patch1:                %{name}-x32.patch
 Patch2:                systemd-fallback.patch
 URL:           https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires: ModemManager-devel >= 1.0.0
@@ -186,6 +187,7 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{?with_systemd:%patch2 -p1}
 
 grep -rl /usr/bin/env examples | xargs sed -i -e '1{
@@ -280,12 +282,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

diff --git a/ifcfg-path.patch b/ifcfg-path.patch
index 7a86bedc9bdacd45ed40077c3fa173d76dbd2722..4c2ad20a8f9068f97dd4dad4b64614f62299f9a9 100644 (file)
--- a/ifcfg-path.patch
+++ b/ifcfg-path.patch
@@ -1,13 +1,13 @@
 TODO: make it configurable via dist tag in configure.ac
 
---- 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 @@
+--- NetworkManager-1.28.0/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h.orig     2020-12-09 21:18:05.050791134 +0100
++++ NetworkManager-1.28.0/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h  2020-12-09 21:18:11.494457108 +0100
+@@ -21,7 +21,7 @@
  #define AUGNEW_TAG ".augnew"
  #define AUGTMP_TAG ".augtmp"
  
 -#define IFCFG_DIR SYSCONFDIR "/sysconfig/network-scripts"
 +#define IFCFG_DIR SYSCONFDIR "/sysconfig/interfaces"
  
- #define IFCFG_PLUGIN_NAME "ifcfg-rh"
- #define IFCFG_PLUGIN_INFO "(c) 2007 - 2015 Red Hat, Inc.  To report bugs please use the NetworkManager mailing list."
+ #define TYPE_ETHERNET   "Ethernet"
+ #define TYPE_WIRELESS   "Wireless"