From f8d0cbcd8b6c0937c755faab0ff8d77824938fe2 Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Tue, 18 Oct 2022 22:30:09 +0200
Subject: [PATCH 1/2] [Chore] Remove jakarta baker from test build and docs

Problem: test builds in CI try to build the jakarta baker
for a quick binary package building test, but that baker no
longer exist.
Additionally, some instructions in docs mention it too.

Solution: Remove jakarta baker from binary package tests builds
and from documentation.
---
 .buildkite/pipeline-raw.yml | 4 ++--
 docs/distros/fedora.md      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.buildkite/pipeline-raw.yml b/.buildkite/pipeline-raw.yml
index 0e810b54f..699f8a69f 100644
--- a/.buildkite/pipeline-raw.yml
+++ b/.buildkite/pipeline-raw.yml
@@ -117,7 +117,7 @@ steps:
    - eval "$SET_VERSION"
    # Building all binary packages will take significant amount of time, so we build only one
    # in order to ensure package generation sanity
-   - ./docker/docker-tezos-packages.sh --os ubuntu --type binary --package tezos-baker-013-PtJakart
+   - ./docker/docker-tezos-packages.sh --os ubuntu --type binary --package tezos-baker-PtKathma
    - rm -rf out
    # It takes much time to build binary package, so we do it only on master
    branches: "master"
@@ -141,7 +141,7 @@ steps:
    - eval "$SET_VERSION"
    # Building all binary packages will take significant amount of time, so we build only one
    # in order to ensure package generation sanity
-   - ./docker/docker-tezos-packages.sh --os fedora --type binary --package tezos-baker-013-PtJakart
+   - ./docker/docker-tezos-packages.sh --os fedora --type binary --package tezos-baker-PtKathma
    - rm -rf out
    # It takes much time to build binary package, so we do it only on master
    branches: "master"
diff --git a/docs/distros/fedora.md b/docs/distros/fedora.md
index ca734e3f7..3e512b846 100644
--- a/docs/distros/fedora.md
+++ b/docs/distros/fedora.md
@@ -11,11 +11,11 @@ E.g. in order to install `tezos-client` or `tezos-baker` run the following comma
 # use dnf
 sudo dnf copr enable @Serokell/Tezos
 sudo dnf install tezos-client
-sudo dnf install tezos-baker-013-PtJakart
+sudo dnf install tezos-baker-PtKathma
 
 # or use yum
 sudo yum copr enable @Serokell/Tezos
-sudo yum install tezos-baker-013-PtJakart
+sudo yum install tezos-baker-PtKathma
 ```
 Once you install such packages the commands `tezos-*` will be available.
 

From 73a60982e94518ccfcc88af6d5a1d4bb8d97fe8e Mon Sep 17 00:00:00 2001
From: pasqu4le <pasqu4le@gmail.com>
Date: Wed, 19 Oct 2022 01:07:06 +0200
Subject: [PATCH 2/2] [Chore] Fixup fedora binary packaging

Problem: docker packaging of binary in fedora is broken
because of outdated uses of the package name instead of
the (new) binaries name.

Solution: fixup fedora binary packaging by using the
binaries name where needed in the process.
---
 docker/package/model.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker/package/model.py b/docker/package/model.py
index 4b7ea775b..659178bb4 100644
--- a/docker/package/model.py
+++ b/docker/package/model.py
@@ -286,6 +286,7 @@ def gen_control_file(self, deps, ubuntu_version, out):
             f.write(file_contents)
 
     def gen_spec_file(self, build_deps, run_deps, out):
+        binary_name = self.name.replace("tezos", "octez")
         build_requires = " ".join(build_deps)
         requires = " ".join(run_deps)
         str_additional_native_deps = ", ".join(
@@ -319,13 +320,13 @@ def gen_spec_file(self, build_deps, run_deps, out):
 %setup -q
 %build
 %install
-make %{{name}}
+make {binary_name}
 mkdir -p %{{buildroot}}/%{{_bindir}}
-install -m 0755 %{{name}} %{{buildroot}}/%{{_bindir}}
+install -m 0755 {binary_name} %{{buildroot}}/%{{_bindir}}
 {systemd_install}
 %files
 %license LICENSE
-%{{_bindir}}/%{{name}}
+%{{_bindir}}/{binary_name}
 {systemd_files}
 {systemd_macros}
 """