From 3ee95e3150e900352302bba139a8f2fb37a6c3f2 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 25 Mar 2022 23:53:28 +1300
Subject: [PATCH 1/3] bump-package-version updates rpm changelog

---
 builder/bump-package-version     |  2 +-
 builder/bump-package-version-rpm | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 builder/bump-package-version-rpm

diff --git a/builder/bump-package-version b/builder/bump-package-version
index 7c2478f..18012cf 100755
--- a/builder/bump-package-version
+++ b/builder/bump-package-version
@@ -12,7 +12,7 @@ add_debian_revision_to_new_version() {
 }
 
 bump_rpm() {
-  sed -i "s/^Version:.\+/Version:        $new_version/" centos/kasmvncserver.spec
+  builder/bump-package-version-rpm "$new_version"
 }
 
 bump_deb() {
diff --git a/builder/bump-package-version-rpm b/builder/bump-package-version-rpm
new file mode 100755
index 0000000..1b04cb7
--- /dev/null
+++ b/builder/bump-package-version-rpm
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -eo pipefail
+
+new_version="$1"
+spec_file="centos/kasmvncserver.spec"
+
+bump_version() {
+  sed -i "s/^Version:.\+/Version:        $new_version/" "$spec_file"
+}
+
+detect_release_version() {
+  release_version=$(sed -ne 's/^Release:\s\+//p' "$spec_file" | sed -e 's/%.\+$//')
+}
+
+bump_changelog() {
+  detect_release_version
+
+  local date=$(date +'%a %b %d %Y')
+  local changelog_version="$new_version-$release_version"
+  local new_changelog_entry="* $date KasmTech <info@kasmweb.com> - $changelog_version\n- Upstream release"
+
+  sed -i -e "s/%changelog/%changelog\n$new_changelog_entry/" "$spec_file"
+}
+
+bump_version
+bump_changelog

From d6d13b59cb602284efdf5d8bac527272e9e9b688 Mon Sep 17 00:00:00 2001
From: Dmitry Maksyoma <ledestin@gmail.com>
Date: Fri, 25 Mar 2022 23:59:47 +1300
Subject: [PATCH 2/3] Refactor: extract bump-package-version-deb(1)

---
 builder/bump-package-version     | 14 +-------------
 builder/bump-package-version-deb | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100755 builder/bump-package-version-deb

diff --git a/builder/bump-package-version b/builder/bump-package-version
index 18012cf..ff4fd29 100755
--- a/builder/bump-package-version
+++ b/builder/bump-package-version
@@ -7,24 +7,12 @@ update_version_to_meet_packaging_standards() {
     sed -e 's/\([0-9]\)-\([a-zA-Z]\)/\1~\2/')
 }
 
-add_debian_revision_to_new_version() {
-  echo "$new_version-1"
-}
-
 bump_rpm() {
   builder/bump-package-version-rpm "$new_version"
 }
 
 bump_deb() {
-  local image="debbump_package_version:dev"
-  local L_UID=$(id -u)
-  local L_GID=$(id -g)
-  local debian_version=$(add_debian_revision_to_new_version)
-
-  docker build -t "$image" -f builder/dockerfile.bump-package-version .
-  docker run --rm -v "$PWD":/src --user "$L_UID:$L_GID" \
-    "$image" /bin/bash -c \
-    "cd /src && builder/bump-package-version-inside-docker-deb $debian_version"
+  builder/bump-package-version-deb "$new_version"
 }
 
 new_version="$1"
diff --git a/builder/bump-package-version-deb b/builder/bump-package-version-deb
new file mode 100755
index 0000000..65b417f
--- /dev/null
+++ b/builder/bump-package-version-deb
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -eo pipefail
+
+new_version="$1"
+
+add_debian_revision_to_new_version() {
+  echo "$new_version-1"
+}
+
+bump_deb() {
+  local image="debbump_package_version:dev"
+  local L_UID=$(id -u)
+  local L_GID=$(id -g)
+  local debian_version=$(add_debian_revision_to_new_version)
+
+  docker build -t "$image" -f builder/dockerfile.bump-package-version .
+  docker run --rm -v "$PWD":/src --user "$L_UID:$L_GID" \
+    "$image" /bin/bash -c \
+    "cd /src && builder/bump-package-version-inside-docker-deb $debian_version"
+}
+
+bump_deb

From 73ed994b21fe5dc04b27e65b792e93e7d6e18de4 Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Wed, 30 Mar 2022 09:20:26 -0700
Subject: [PATCH 3/3] support loop in version bumping for RPMs

---
 builder/bump-package-version-rpm | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/builder/bump-package-version-rpm b/builder/bump-package-version-rpm
index 1b04cb7..d46720c 100755
--- a/builder/bump-package-version-rpm
+++ b/builder/bump-package-version-rpm
@@ -3,25 +3,29 @@
 set -eo pipefail
 
 new_version="$1"
-spec_file="centos/kasmvncserver.spec"
+specs="centos/kasmvncserver.spec
+oracle/kasmvncserver.spec"
 
 bump_version() {
-  sed -i "s/^Version:.\+/Version:        $new_version/" "$spec_file"
+  sed -i "s/^Version:.\+/Version:        $new_version/" "$1"
 }
 
 detect_release_version() {
-  release_version=$(sed -ne 's/^Release:\s\+//p' "$spec_file" | sed -e 's/%.\+$//')
+  release_version=$(sed -ne 's/^Release:\s\+//p' "$1" | sed -e 's/%.\+$//')
 }
 
 bump_changelog() {
-  detect_release_version
+  detect_release_version "$1"
 
   local date=$(date +'%a %b %d %Y')
   local changelog_version="$new_version-$release_version"
   local new_changelog_entry="* $date KasmTech <info@kasmweb.com> - $changelog_version\n- Upstream release"
 
-  sed -i -e "s/%changelog/%changelog\n$new_changelog_entry/" "$spec_file"
+  sed -i -e "s/%changelog/%changelog\n$new_changelog_entry/" "$1"
 }
 
-bump_version
-bump_changelog
+IFS=$'\n'
+for spec_file in $specs; do
+  bump_version $spec_file
+  bump_changelog $spec_file
+done