开源软件构建与测试

Changes of Revision 2

_service:tar_scm:NetworkManager.spec Changed

@@ -1,6 +1,6 @@
 %global wireless_tools_version 1:28-0pre9
 %global wpa_supplicant_version 1:1.1
-%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\$^\\s*\$"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
+%global ppp_version %(pkg-config --modeversion pppd 2>/dev/null || sed -n 's/^#define\\s*VERSION\\s*"\$^\\s*\$"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 %global real_version 1.42.8
 %global snapshot %{nil}
@@ -18,6 +18,8 @@
 
 %global snap %{?snapshot_dot}%{?git_sha_dot}
 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\$1-90-9*\\.1-90-9*\$\\.0-90-9*$/\\1/p')
+%global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
+%global systemd_units_cloud_setup nm-cloud-setup.service nm-cloud-setup.timer
 
 %bcond_without adsl
 %bcond_without bluetooth
@@ -49,8 +51,8 @@
 Name:             NetworkManager
 Version:          1.42.8
 Epoch:            1
-Release:          2
-Summary:          Network Link Manager and User Applications
+Release:          3
+Summary:          4
 License:          GPLv2+
 URL:              https://networkmanager.dev/
 Source:           https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{version}.tar.xz
@@ -59,9 +61,8 @@
 Patch1:           fix-wants-and-add-requires.patch
 Patch2:           bugfix-use-PartOf-replace-Requires-in-service.patch
 Patch3:           bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.patch
-
-Patch6005:        NetworkManager-Add-sw64-architecture.patch
-#Patch6006:        delete-lease-file-when-connection-deleted.patch
+Patch4:           NetworkManager-Add-sw64-architecture.patch
+Patch5:           delete-lease-file-when-connection-deleted.patch
 
 BuildRequires:    gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel
 BuildRequires:    dbus-devel glib2-devel gobject-introspection-devel jansson-devel
@@ -409,7 +410,7 @@
 /usr/bin/udevadm control --reload-rules || :
 /usr/bin/udevadm trigger --subsystem-match=net || :
 
-%systemd_postun NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service nm-priv-helper.service
+%systemd_postun %{systemd_units}
 
 %ldconfig_scriptlets glib
 %ldconfig_scriptlets libnm
@@ -545,6 +546,19 @@
 %{_datadir}/gtk-doc/html/NetworkManager/*
 
 %changelog
+* Tue Aug 29 2023 gaoxingwang <gaoxingwang1@huawei.com> - 1:1.42.8-4
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:sync bugfix patch: delete lease file when connection deleted and 
+       update the way to get ppp version because patchlevel.h no more provided in  ppp-2.5.0
+
+* Thu Aug 24 2023 gaoxingwang <gaoxingwang1@huawei.com> - 1:1.42.8-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:NetworkManager-dispatcher.service not enabled when installed due to systemd_units not defined
+
 * Tue Aug 8 2023 gaoxingwang <gaoxingwang1@huawei.com> - 1:1.42.8-2
 - Type:requirement
 - CVE:NA