From: Jakub Ružička <jakub.ruzicka@nic.cz>
Date: Fri, 8 Jan 2021 16:23:17 +0000 (+0100)
Subject: distro: introduce upstream cznic release prefix
X-Git-Tag: v5.3.0~23^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58f48b2b218faf1ccbe59ad25b956f4da948ec30;p=thirdparty%2Fknot-resolver.git

distro: introduce upstream cznic release prefix

using cznic.1 release string for upstream packages ensures they are
prefered over downstream ones and that their versions don't collide
which was causing issues for users with both downstream and upstream
packaging repos enabled.

Following statements are true according to `dpkg --compare-versions`:

    1.2.3-1   < 1.2.3-cznic.1
    1.2.3-999 < 1.2.3-cznic.1

So upstream packages should always take precedence over downstream
packages of the same version.
---

diff --git a/distro/deb/changelog b/distro/deb/changelog
index b0a6a3f1a..4d6f28b94 100644
--- a/distro/deb/changelog
+++ b/distro/deb/changelog
@@ -1,4 +1,4 @@
-knot-resolver (__VERSION__-1) unstable; urgency=medium
+knot-resolver (__VERSION__-cznic.1) unstable; urgency=medium
 
   * move changelog to OBS
   * see NEWS or https://knot-resolver.cz
diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 66d011510..45870cefb 100644
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -10,7 +10,7 @@
 
 Name:           knot-resolver
 Version:        %{VERSION}
-Release:        1%{?dist}
+Release:        cznic.1%{?dist}
 Summary:        Caching full DNS Resolver
 
 License:        GPL-3.0-or-later