Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package NetworkManager-branding for
openSUSE:Factory checked in at 2022-08-05 19:50:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-branding (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-branding.new.1521 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-branding"
Fri Aug 5 19:50:43 2022 rev:4 rq:992694 version:42.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-branding/NetworkManager-branding.changes
2020-06-29 21:17:51.285689208 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-branding.new.1521/NetworkManager-branding.changes
2022-08-05 19:51:34.933545713 +0200
@@ -1,0 +2,6 @@
+Thu Jul 28 14:12:37 UTC 2022 - Frederic Crozat <fcro...@suse.com>
+
+- Move conncheck config file out of /etc. No longer
+ import main config file.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-branding.spec ++++++
--- /var/tmp/diff_new_pack.Q4yDXz/_old 2022-08-05 19:51:35.365546828 +0200
+++ /var/tmp/diff_new_pack.Q4yDXz/_new 2022-08-05 19:51:35.385546880 +0200
@@ -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 @@
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 @@
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
-
-%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf
+%{_prefix}/lib/NetworkManager/conf.d/conncheck-%{branding_name}.conf
%changelog
