update to 1.26-rc1 (1.25.90)

This commit is contained in:
Thomas Haller 2020-06-15 19:30:02 +02:00
parent 28e6474b9c
commit a06b38bcbe
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
3 changed files with 15 additions and 10 deletions

1
.gitignore vendored
View File

@ -374,3 +374,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.23.91.tar.xz /NetworkManager-1.23.91.tar.xz
/NetworkManager-1.24.0.tar.xz /NetworkManager-1.24.0.tar.xz
/NetworkManager-1.24.2.tar.xz /NetworkManager-1.24.2.tar.xz
/NetworkManager-1.25.90.tar.xz

View File

@ -5,9 +5,9 @@
%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 rpm_version 1.24.2 %global rpm_version 1.26.0
%global real_version 1.24.2 %global real_version 1.25.90
%global release_version 1 %global release_version 0.1
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
@ -242,6 +242,9 @@ BuildRequires: libubsan
BuildRequires: firewalld-filesystem BuildRequires: firewalld-filesystem
%endif %endif
BuildRequires: iproute BuildRequires: iproute
%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: iproute-tc
%endif
Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release} Provides: %{name}-dispatcher%{?_isa} = %{epoch}:%{version}-%{release}
@ -389,19 +392,18 @@ This package contains NetworkManager support for PPP.
%package libnm %package libnm
Summary: Libraries for adding NetworkManager support to applications (new API). Summary: Libraries for adding NetworkManager support to applications.
Group: Development/Libraries Group: Development/Libraries
Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release} Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release}
License: LGPLv2+ License: LGPLv2+
%description libnm %description libnm
This package contains the libraries that make it easier to use some This package contains the libraries that make it easier to use some
NetworkManager functionality from applications. This is the new NetworkManager functionality from applications.
NetworkManager API. See also NetworkManager-glib.
%package libnm-devel %package libnm-devel
Summary: Header files for adding NetworkManager support to applications (new API). Summary: Header files for adding NetworkManager support to applications.
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
Requires: glib2-devel Requires: glib2-devel
@ -410,8 +412,7 @@ License: LGPLv2+
%description libnm-devel %description libnm-devel
This package contains the header and pkg-config files for development This package contains the header and pkg-config files for development
applications using NetworkManager functionality from applications. This applications using NetworkManager functionality from applications.
is the new NetworkManager API. See also NetworkManager-glib-devel.
%if %{with connectivity_fedora} %if %{with connectivity_fedora}
@ -1081,6 +1082,9 @@ fi
%changelog %changelog
* Mon Jun 15 2020 Thomas Haller <thaller@redhat.com> - 1:1.26.0-0.1
- update to 1.26-rc1 (1.25.90)
* Fri May 29 2020 Thomas Haller <thaller@redhat.com> - 1:1.24.2-1 * Fri May 29 2020 Thomas Haller <thaller@redhat.com> - 1:1.24.2-1
- Update to 1.24.2 release - Update to 1.24.2 release
- ifcfg-rh: handle "802-1x.{,phase2-}ca-path" (rh #1841395, CVE-2020-10754) - ifcfg-rh: handle "802-1x.{,phase2-}ca-path" (rh #1841395, CVE-2020-10754)

View File

@ -1 +1 @@
SHA512 (NetworkManager-1.24.2.tar.xz) = 34fcbdffe5b621ff5d851e6b8de07ddf3f3ad294822adc36d6c36682049cc1f7e0280631ecc38d335871a3ee3483b338106b3a513d46a6cafdf61849027fe923 SHA512 (NetworkManager-1.25.90.tar.xz) = bc7710cc11876e186ef535fd09d026a36d97b80376c52a26c0c62fbc967127b6394646fb056491d719f283e3e1a61e012b204e422ddfa9834e98d5b552b6a53d