From b42cc4e3f2f9de444fb8f1421e434a2f64aa0b08 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 20 Jun 2024 10:14:29 +0200 Subject: [PATCH] Update patch numbering As done in the c9s branch, use 0 as base for patches that change behavior from upstream, and 1000 for backports. In this way, upon a rebase we can drop all (1000+x) patches and keep others. Related: RHEL-35580 --- ...int-fix-port-reactivation-when-controller-is-.patch | 0 NetworkManager.spec | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) rename 0001-checkpoint-fix-port-reactivation-when-controller-is-.patch => 1001-checkpoint-fix-port-reactivation-when-controller-is-.patch (100%) diff --git a/0001-checkpoint-fix-port-reactivation-when-controller-is-.patch b/1001-checkpoint-fix-port-reactivation-when-controller-is-.patch similarity index 100% rename from 0001-checkpoint-fix-port-reactivation-when-controller-is-.patch rename to 1001-checkpoint-fix-port-reactivation-when-controller-is-.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index a4b045c..bace11c 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -219,8 +219,14 @@ Source7: 70-nm-connectivity.conf Source8: readme-ifcfg-rh.txt Source9: readme-ifcfg-rh-migrated.txt -#Patch1: 0001-some.patch -Patch1: 0001-checkpoint-fix-port-reactivation-when-controller-is-.patch +# RHEL downstream patches that change behavior from upstream. +# These are not bugfixes, hence they are also relevant after +# the next rebase of the source tarball. +# Patch0001: 0001-some.patch + +# Bugfixes that are only relevant until next rebase of the package. +# Patch1001: 1001-some.patch +Patch1001: 1001-checkpoint-fix-port-reactivation-when-controller-is-.patch Requires(post): systemd %if 0%{?fedora} || 0%{?rhel} >= 8