PR#2: Remove bridge-utils dependency - rpms/netcf

rpms / netcf

#2 Remove bridge-utils dependency

Closed 3 years ago by laine. Opened 3 years ago by bkircher.

Unknown source master into master

Remove bridge-utils dependency

Benjamin Kircher • 3 years ago

0749230

netcf.spec

file modified

+5 -6

		`@@ -1,6 +1,6 @@`
		`Name: netcf`
		`Version: 0.2.8`
		`- Release: 16%{?dist}%{?extra_release}`
		`+ Release: 17%{?dist}%{?extra_release}`
		`Summary: Cross-platform network configuration library`

		`License: LGPLv2+`
		`@@ -29,7 +29,7 @@`

		`# git is used to build a source tree with patches applied (see the`
		`# %prep section)`
		`- BuildRequires: gcc`
		`+ BuildRequires: gcc`
		`BuildRequires: git`

		`# Fedora 20 / RHEL-7 are where netcf first uses systemd. Although earlier`
		`@@ -93,10 +93,6 @@`
		`%package libs`
		`Summary: Libraries for %{name}`

		`- # bridge-utils is needed because /sbin/ifup calls brctl`
		`- # if you create a bridge device`
		`- Requires: bridge-utils`
		`-`
		`%description libs`
		`The libraries for %{name}.`

		`@@ -211,6 +207,9 @@`
		`%{_libdir}/pkgconfig/netcf.pc`

		`%changelog`
		`+ * Wed Dec 02 2020 Benjamin Kircher <bkircher@0xadd.de> - 0.2.8-17`
		`+ - Remove bridge-utils dependency`
		`+`
		`* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.8-16`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild`

bkircher commented 3 years ago

/usr/sbin/ifup is provided by NetworkManager theses days which does not require brctl of course. Allows getting rid of bridge-utils in favour of iproute2 command set.

laine commented 3 years ago

Yeah, that change was made upstream a couple years ago, but since upstream has been stagnating, it never made it into the Fedora package (I'm actually considering completely deprecating the Fedora package, but that's a separate story).

Thanks for pointing it out.

laine commented 3 years ago

I was unable to get this in by simply clicking on the Merge button in the UI, since there was a trivial merge conflict (you had removed a space in the "BuildRequires: gcc" line, and someone else had added a new "BuildRequires: make" line just above that). So I had to grab the patch locally, and use git am to merge it in manually (there's probably a simple way to resolve merge conflicts in the UI, but this is the first I've ever used it).

Anyway, your patch is now pushed to master, so rawhide at least will no longer require bridge-utils. Thanks again!