Accepting request 992694 from GNOME:Factory

- Move conncheck config file out of /etc. No longer
  import main config file.

(to be used with corresponding NM submission)
(requires changes in prjconfig to prefer NM-branding-upstream for building) (forwarded request 991574 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/992694
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/NetworkManager-branding?expand=0&rev=4

NetworkManager-branding.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jul 28 14:12:37 UTC 2022 - Frederic Crozat <fcrozat@suse.com>
+
+- Move conncheck config file out of /etc. No longer
+  import main config file.
+
 -------------------------------------------------------------------
 Sun Jun 28 13:23:02 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 

NetworkManager-branding.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package NetworkManager-branding
+# spec file
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -32,14 +32,13 @@ ExclusiveArch:  %{nil}
 Name:           NetworkManager-branding%{?dash}%{branding_name}
 Version:        42.1
 Release:        0
-Summary:        Default %{branding_name} branding for %{_sysconfdir}/NetworkManager/NetworkManager.conf
+Summary:        Default %{branding_name} branding for NetworkManager configuration file.
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/System
 URL:            http://www.gnome.org/projects/NetworkManager/
 Source0:        NetworkManager.conf.in
 Source1:        NetworkManager-branding-COPYING
 BuildRequires:  NetworkManager
-BuildRequires:  NetworkManager-branding-upstream
 %requires_eq    NetworkManager
 Supplements:    packageand(NetworkManager:branding-%{branding_name})
 Conflicts:      NetworkManager-branding
@@ -59,23 +58,18 @@ obtain IP addresses from a DHCP server, and change name servers
 whenever it sees fit.
 
 This package provides the default %{branding_name} configuration for
-%{_sysconfdir}/NetworkManager/NetworkManager.conf, configured to
+/usr/lib/NetworkManager/conf.d/conncheck.conf, configured to
 check connectivity against http://conncheck.opensuse.org.
 
 %prep
 %setup -q -T -c %{name}-%{version}
 cp %{SOURCE1} COPYING
-cp -a %{_sysconfdir}/NetworkManager/NetworkManager.conf ./
-
-%build
-cat %{SOURCE0} >> NetworkManager.conf
 
 %install
-install -m0644 -D NetworkManager.conf %{buildroot}%{_sysconfdir}/NetworkManager/NetworkManager.conf
+install -m0644 -D %{SOURCE0} %{buildroot}%{_prefix}/lib/NetworkManager/conf.d/conncheck-%{branding_name}.conf
 
 %files
 %license COPYING
-
+%{_prefix}/lib/NetworkManager/conf.d/conncheck-%{branding_name}.conf
-%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf
 
 %changelog