rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix ppp version discovery

Browse Source
This commit is contained in:
Adam Williamson 2023-04-18 18:01:19 -07:00
parent 948f57c7bf
commit ef05be83e2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NetworkManager.spec
View File

@ -1,12 +1,12 @@
%global wpa_supplicant_version 1:1.1 %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 --modversion pppd 2>/dev/null || echo bad)
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1 %global epoch_version 1
%global real_version 1.43.5 %global real_version 1.43.5
%global rpm_version %{real_version} %global rpm_version %{real_version}
%global release_version 2 %global release_version 3
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
%global bcond_default_debug 0 %global bcond_default_debug 0
@ -252,7 +252,9 @@ BuildRequires: dbus-devel >= %{dbus_version}
BuildRequires: glib2-devel >= 2.40.0 BuildRequires: glib2-devel >= 2.40.0
BuildRequires: gobject-introspection-devel >= 0.10.3 BuildRequires: gobject-introspection-devel >= 0.10.3
%if %{with ppp} %if %{with ppp}
BuildRequires: ppp-devel >= 2.4.5 # version constraint here is because the use of pkg-config to discover
# the ppp version (above) only works from 2.5.0 onwards
BuildRequires: ppp-devel >= 2.5.0
%endif %endif
%if %{with crypto_gnutls} %if %{with crypto_gnutls}
BuildRequires: gnutls-devel >= 2.12 BuildRequires: gnutls-devel >= 2.12
@ -1246,6 +1248,9 @@ fi
%changelog %changelog
* Tue Apr 18 2023 Adam Williamson <awilliam@redhat.com> - 1:1.43.5-3
- Fix ppp version discovery
* Tue Apr 18 2023 Adam Williamson <awilliam@redhat.com> - 1:1.43.5-2 * Tue Apr 18 2023 Adam Williamson <awilliam@redhat.com> - 1:1.43.5-2
- Rebuild for ppp 2.5.0 - Rebuild for ppp 2.5.0