Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2016-03-26 15:08:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager" Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2016-01-08 15:39:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2016-03-26 15:08:10.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Mar 13 23:20:06 UTC 2016 - [email protected] + +- Split out a NetworkManager-branding-upstream subpackage that + installs the default upstream version of the + /etc/NetworkManager/NetworkManager.conf file. +- Add Requires: NetworkManager-branding to main package. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.L4CU2N/_old 2016-03-26 15:08:11.000000000 +0100 +++ /var/tmp/diff_new_pack.L4CU2N/_new 2016-03-26 15:08:11.000000000 +0100 @@ -94,6 +94,7 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(uuid) +Requires: NetworkManager-branding Requires: dhcp-client Requires: iproute2 Requires: iputils @@ -226,6 +227,22 @@ This package provides the GObject Introspection bindings for the NetworkManager library. +%package branding-upstream +Summary: Default upstream configuration for /etc/NetworkManager/NetworkManager.conf +Group: Productivity/Networking/System +Requires: NetworkManager = %{version} +Provides: NetworkManager-branding = %{version} +Conflicts: otherproviders(NetworkManager-branding) +Supplements: packageand(NetworkManager:branding-upstream) +BuildArch: noarch + +%description branding-upstream +This package provides the default upstream configuration for +%{_sysconfdir}/NetworkManager/NetworkManager.conf. Specifically, +it is not configured for connection checking against +http://conncheck.opensuse.org. For, the version with connection +checking, install %{name}-branding-openSUSE. + %lang_package %prep %setup -n %{name}-%{version} -q @@ -395,7 +412,6 @@ %dir %{_sysconfdir}/NetworkManager/VPN %dir %{_sysconfdir}/NetworkManager/dispatcher.d %dir %{_sysconfdir}/NetworkManager/system-connections -%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf %attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/nfs %{_unitdir}/NetworkManager.service %{_unitdir}/NetworkManager-dispatcher.service @@ -467,4 +483,8 @@ %files lang -f %{name}.lang +%files branding-upstream +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf + %changelog
