From 8464cb3f17a37c0fce3f50cccba0c71277d8da38 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Fri, 16 Jul 2021 22:04:47 +0800 Subject: [PATCH] Revert "Upgrade to prerelease 1.33.1-0.1.b49a168935" Resolves: RHBZ#1966123 This reverts commit 06d5c64456b3033bc130e10d02cedc4578532884. --- .gitignore | 1 - NetworkManager.spec | 17 +++++------------ sources | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 5dd6f9d..c1642ef 100644 --- a/.gitignore +++ b/.gitignore @@ -389,4 +389,3 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.31.5.tar.xz /NetworkManager-1.32.0.tar.xz /NetworkManager-1.32.2.tar.xz -/NetworkManager-1.33.1-0.1.b49a168935.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index ec37234..67076dc 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -5,15 +5,11 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global rpm_version 1.33.1 -%global release_version 0 -%global snapshot 1 -%global git_sha b49a168935 -%if "x%{?snapshot}" != "x" -%global real_version %{rpm_version}-%{release_version}.%{snapshot}.%{git_sha} -%else -%global real_version %{rpm_version} -%endif +%global rpm_version 1.32.2 +%global real_version 1.32.2 +%global release_version 1 +%global snapshot %{nil} +%global git_sha %{nil} %global obsoletes_device_plugins 1:0.9.9.95-1 %global obsoletes_ppp_plugin 1:1.5.3 @@ -1154,9 +1150,6 @@ fi %changelog -* Fri Jul 16 2021 Gris Ge - 1.33.1-0.1.b49a168935 -- Upgrade to prerelease 1.33.1-0.1.b49a168935. - * Thu Jul 1 2021 Wen Liang - 1:1.32.2-1 - update to 1.32.2 release - dhcp/systemd: ignore FORCERENEW requests for DHCPV4 (rh #1966123, CVE-2020-13529) diff --git a/sources b/sources index 178ccb5..0925f76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.33.1-0.1.b49a168935.tar.xz) = 9ed504e5a3853976eb955b8c7e3dabfda3f445247eb83f0a2c0b4cda0485e29d226e53f3643b5c3f215973a28e3de2b4c1001c71346e5ca6ac25025a872c2f53 +SHA512 (NetworkManager-1.32.2.tar.xz) = 9c7891a1106ebf333344818d29810ae182b284d1966760ec79bafa0618378a5ca68d58ec941357328ae8d4a43473f3916d62e4cfa316a46532773326312c0cc1