From b01c504085713d5b616a9587cd363954d0467c01 Mon Sep 17 00:00:00 2001
From: Miguel Negron <manegron@redborder.com>
Date: Thu, 14 Dec 2023 16:33:19 +0000
Subject: [PATCH 01/22] Trigger workflow

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 748eac4..d8b6be3 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 ## Overview
 
-LogStatter is a high-performance monitoring application for logstash written in Rust. is designed to provide lightning-fast real-time process & pipeline anaylsis for Logstash, with output capabilities to Kafka.
+LogStatter is a high-performance monitoring application for logstash written in Rust. is designed to provide lightning-fast real-time process & pipeline anaylsis for Logstash, with output capabilities to Kafka
 
 ## Getting Started
 

From 9a08ae7c6db68ae7bc852bb76b0c94ed96d24ba5 Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:31:36 +0000
Subject: [PATCH 02/22] Update workflow

---
 .github/workflows/buldrpm.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 0fcf350..138e6e7 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -3,7 +3,8 @@ name: RPM Build and Upload
 on:
   pull_request:
     branches:
-      - 'release/*'
+      - 'main'
+      - 'master'
 
 jobs:
   build:

From 3a7c8a7c935cd5c5a4e6ce6824fa013940386cca Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:33:38 +0000
Subject: [PATCH 03/22] Update workflow

---
 .github/workflows/buldrpm.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 138e6e7..2ebc73f 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -45,7 +45,14 @@ jobs:
           git pull origin $DEFAULT_BRANCH
         env:
           DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
-          
+
+      - name: Create tag
+        run: |
+          git fetch --all --tags
+          tag_name="${{ env.VERSION }}"
+          if ! git rev-parse -q --verify "refs/tags/$tag_name" >/dev/null; then
+            git tag $tag
+            
       - name: Set Version & pull tag
         id: version
         run: |
@@ -204,13 +211,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSION: ${{ env.VERSION }}
           DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
-
-      - name: Create tag
-        run: |
-          git fetch --all --tags
-          tag_name="${{ env.VERSION }}"
-          if ! git rev-parse -q --verify "refs/tags/$tag_name" >/dev/null; then
-            git tag $tag
       
       - name: Release
         uses: softprops/action-gh-release@v1

From 7a39c0628bae1df9c9fde74991e656b4b1326010 Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:34:48 +0000
Subject: [PATCH 04/22] Update workflow

---
 .github/workflows/buldrpm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 2ebc73f..80098ab 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -52,7 +52,7 @@ jobs:
           tag_name="${{ env.VERSION }}"
           if ! git rev-parse -q --verify "refs/tags/$tag_name" >/dev/null; then
             git tag $tag
-            
+
       - name: Set Version & pull tag
         id: version
         run: |

From a6cc7e5939ed9abb93529f65f9ab0d0f14c3fc9d Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:36:08 +0000
Subject: [PATCH 05/22] Update workflow

---
 .github/workflows/buldrpm.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 80098ab..8912e6e 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -52,6 +52,7 @@ jobs:
           tag_name="${{ env.VERSION }}"
           if ! git rev-parse -q --verify "refs/tags/$tag_name" >/dev/null; then
             git tag $tag
+          fi
 
       - name: Set Version & pull tag
         id: version

From 0c5a8bd4ec099b320ce01c4d53ddd922669a674b Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:37:44 +0000
Subject: [PATCH 06/22] Update workflow

---
 .github/workflows/buldrpm.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 8912e6e..bd6fd4a 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -17,6 +17,11 @@ jobs:
           fetch-depth: 0
           ref: 
 
+      - name: Set Git identity
+        run: |
+          git config --global user.email "actions@github.com"
+          git config --global user.name "GitHub Actions"
+
       - name: Check Branch and Target
         if: >
           github.event_name == 'pull_request' &&
@@ -52,6 +57,7 @@ jobs:
           tag_name="${{ env.VERSION }}"
           if ! git rev-parse -q --verify "refs/tags/$tag_name" >/dev/null; then
             git tag $tag
+            git push origin $tag
           fi
 
       - name: Set Version & pull tag
@@ -123,11 +129,6 @@ jobs:
         env:
           DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
 
-      - name: Set Git identity
-        run: |
-          git config --global user.email "actions@github.com"
-          git config --global user.name "GitHub Actions"
-
       - name: Bump version with actions
         run: |
           git pull

From e72022af05814b2e466a5d51c77ef6bc07791972 Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:38:50 +0000
Subject: [PATCH 07/22] Update workflow

---
 .github/workflows/buldrpm.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index bd6fd4a..0760e39 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -57,9 +57,12 @@ jobs:
           tag_name="${{ env.VERSION }}"
           if ! git rev-parse -q --verify "refs/tags/$tag_name" >/dev/null; then
             git tag $tag
+            git checkout $DEFAULT_BRANCH
             git push origin $tag
           fi
-
+        env:
+          DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
+          
       - name: Set Version & pull tag
         id: version
         run: |

From 861a5173e3cba381bd7cc6fa9a4bc9ba94b5d2c3 Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:41:03 +0000
Subject: [PATCH 08/22] Update workflow

---
 .github/workflows/buldrpm.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 0760e39..5442fd5 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -56,13 +56,13 @@ jobs:
           git fetch --all --tags
           tag_name="${{ env.VERSION }}"
           if ! git rev-parse -q --verify "refs/tags/$tag_name" >/dev/null; then
-            git tag $tag
             git checkout $DEFAULT_BRANCH
+            git tag $tag
             git push origin $tag
           fi
         env:
           DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
-          
+
       - name: Set Version & pull tag
         id: version
         run: |

From b869f273f7fbede0c315c7b60e7a0e445134e0eb Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:43:22 +0000
Subject: [PATCH 09/22] Update workflow

---
 .github/workflows/buldrpm.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 5442fd5..fcfca80 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -56,9 +56,7 @@ jobs:
           git fetch --all --tags
           tag_name="${{ env.VERSION }}"
           if ! git rev-parse -q --verify "refs/tags/$tag_name" >/dev/null; then
-            git checkout $DEFAULT_BRANCH
             git tag $tag
-            git push origin $tag
           fi
         env:
           DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
@@ -69,9 +67,6 @@ jobs:
           VERSION=$(echo ${{ github.head_ref }} | sed 's/release\///')
 
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
-          git pull origin $VERSION
-
-          echo "Set VERSION to $VERSION"
 
       - name: Comment version BUMP
         uses: actions/github-script@v5

From b2383b967b93b84e70cc123b9e46fe375110b1fc Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 16:47:28 +0000
Subject: [PATCH 10/22] Update workflow

---
 packaging/rpm/rb-logstatter.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index 3216861..a53c781 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -8,7 +8,7 @@ License:   AGPL-3.0
 URL:       https://github.com/malvads/logstatter
 Source0:   %{name}-%{version}.tar.gz
 
-BuildRequires: gcc openssl-devel
+BuildRequires: perl gcc openssl-devel
 
 %global debug_package %{nil}
 

From 9064bf2fcb920c8693dd3a3216ae4f12a4b1305a Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 17:23:48 +0000
Subject: [PATCH 11/22] Add build dates

---
 build.date | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 build.date

diff --git a/build.date b/build.date
new file mode 100644
index 0000000..fa741e2
--- /dev/null
+++ b/build.date
@@ -0,0 +1,2 @@
+14/12/2023 - 0.0.1
+14/12/2023 - 0.0.2

From 910f0b6855e7eb2de1ebf22bdf6b68e1f95bb327 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 14 Dec 2023 17:25:03 +0000
Subject: [PATCH 12/22] Bump version 0.0.2

---
 packaging/rpm/rb-logstatter.spec | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index a53c781..67ef5fa 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -3,50 +3,37 @@ Version:   %{__version}
 Release:   %{__release}%{?dist}
 BuildArch: x86_64
 Summary:   Logstatter service to monitor logstash
-
 License:   AGPL-3.0
 URL:       https://github.com/malvads/logstatter
 Source0:   %{name}-%{version}.tar.gz
-
 BuildRequires: perl gcc openssl-devel
-
 %global debug_package %{nil}
-
 %description
 %{summary}
-
 %prep
 %autosetup
-
 %build
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 source $HOME/.cargo/env
-
 cargo build --release
-
 %install
 install -D target/release/logstatter %{buildroot}/usr/bin/logstatter
 install -D -m 0644 src/systemd/rb-logstatter.service %{buildroot}/usr/lib/systemd/system/rb-logstatter.service
 install -D -m 0644 src/etc/logstatter.conf %{buildroot}/etc/logstatter/logstatter.conf
-
 %pre
 getent group logstatter >/dev/null || groupadd -r logstatter
 getent passwd logstatter >/dev/null || useradd -r -g logstatter -d /var/lib/logstatter -s /sbin/nologin -c "RedBorder Logstatter User" logstatter
-
 %post
 systemctl daemon-reload
 systemctl start rb-logstatter
-
 %files
 %defattr(0755,logstatter,logstatter)
 /usr/bin/logstatter
 %defattr(644,root,root)
 /usr/lib/systemd/system/rb-logstatter.service
 /etc/logstatter/logstatter.conf
-
 %doc
-
 %changelog
+* Thu Dec 14 2023 Miguel Negron, Malvads <manegron@redborder.com, malvarez@redborder.com> - 0.0.2
 * Mon Dec 11 2023 Miguel Álvarez <malvarez@redborder.com> - 0.0.1-1
 - Initial package release
-

From 3d4b5441220e56bad835c6d3f22aec9a4cc8bf6b Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 14 Dec 2023 17:34:17 +0000
Subject: [PATCH 13/22] Bump version 0.0.2

---
 packaging/rpm/rb-logstatter.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index 67ef5fa..c0c1df6 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -34,6 +34,7 @@ systemctl start rb-logstatter
 /etc/logstatter/logstatter.conf
 %doc
 %changelog
+* Thu Dec 14 2023  <> - 0.0.2
 * Thu Dec 14 2023 Miguel Negron, Malvads <manegron@redborder.com, malvarez@redborder.com> - 0.0.2
 * Mon Dec 11 2023 Miguel Álvarez <malvarez@redborder.com> - 0.0.1-1
 - Initial package release

From 109e5bf77e2f01139cc7df9f0a4ba61e618383e3 Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 17:53:28 +0000
Subject: [PATCH 14/22] Fix CI

---
 .github/workflows/buldrpm.yml    |  6 ++++++
 changelog.tmp                    |  6 ++++++
 packaging/rpm/rb-logstatter.spec | 14 ++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 changelog.tmp

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 24cb582..0e1dab6 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -175,10 +175,16 @@ jobs:
             all_emails+="$email, "
           done
 
+          all_commits=""
+          for commits in "${!authors_commits[@]}"; do
+            all_commits+="${authors_commits["$commits"]}"
+          done
+
           # Trim the trailing comma and space
           all_emails=${all_emails%, *}
 
           echo -e "* $current_date $all_authors <$all_emails> - $VERSION" >> $changelog_file
+          echo -e "$all_commits" >> $changelog_file
 
           spec_file=$(find . -type f -name "*.spec" | head -n 1)
           changelog_section=$(awk '/%changelog/{p=1;next} p' $spec_file)
diff --git a/changelog.tmp b/changelog.tmp
new file mode 100644
index 0000000..8356c78
--- /dev/null
+++ b/changelog.tmp
@@ -0,0 +1,6 @@
+
+* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
+- Fix auto bumping
+- Add auto bumping
+- Update README
+
diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index c0c1df6..9c1fd5d 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -34,7 +34,17 @@ systemctl start rb-logstatter
 /etc/logstatter/logstatter.conf
 %doc
 %changelog
-* Thu Dec 14 2023  <> - 0.0.2
-* Thu Dec 14 2023 Miguel Negron, Malvads <manegron@redborder.com, malvarez@redborder.com> - 0.0.2
+* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
+- Fix auto bumping
+- Add auto bumping
+- Update README
+* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
+authors_commits[malvarez@redborder.com]authors_commits[manegron@redborder.com]
+* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
+- malvarez@redborder.com
+- manegron@redborder.com
+* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
+- 
+* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
 * Mon Dec 11 2023 Miguel Álvarez <malvarez@redborder.com> - 0.0.1-1
 - Initial package release

From b5b72ea68284f93cb5b6c541fe650e5f8353492d Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 17:54:21 +0000
Subject: [PATCH 15/22] Delete chagelog tpm

---
 changelog.tmp | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changelog.tmp

diff --git a/changelog.tmp b/changelog.tmp
deleted file mode 100644
index 8356c78..0000000
--- a/changelog.tmp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
-- Fix auto bumping
-- Add auto bumping
-- Update README
-

From d111b2da2a93d12899f640d0d634768668a86dc3 Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 18:00:41 +0000
Subject: [PATCH 16/22] Fix CI

---
 packaging/rpm/rb-logstatter.spec | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index 9c1fd5d..480be66 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -34,17 +34,6 @@ systemctl start rb-logstatter
 /etc/logstatter/logstatter.conf
 %doc
 %changelog
-* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
-- Fix auto bumping
-- Add auto bumping
-- Update README
-* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
-authors_commits[malvarez@redborder.com]authors_commits[manegron@redborder.com]
-* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
-- malvarez@redborder.com
-- manegron@redborder.com
-* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
-- 
-* Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
+
 * Mon Dec 11 2023 Miguel Álvarez <malvarez@redborder.com> - 0.0.1-1
 - Initial package release

From f22fa25f118cca7c51f1962c451207c0512f469f Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 14 Dec 2023 18:04:16 +0000
Subject: [PATCH 17/22] Bump version 0.0.2

---
 packaging/rpm/rb-logstatter.spec | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index 9c1fd5d..382f697 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -34,6 +34,18 @@ systemctl start rb-logstatter
 /etc/logstatter/logstatter.conf
 %doc
 %changelog
+* Thu Dec 14 2023 Miguel Negron, Malvads, GitHub Actions <manegron@redborder.com, malvarez@redborder.com, actions@github.com> - 0.0.2
+- Trigger workflow
+- Update README
+- Delete chagelog tpm
+- Fix CI
+- Merge branch 'release/0.0.2' of github.com:redBorder/logstatter into release/0.0.2
+- Add build dates
+- Merge branch 'main' into release/0.0.2
+- Fix auto bumping
+- Update workflow
+- Add auto bumping
+- Bump version 0.0.2
 * Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
 - Fix auto bumping
 - Add auto bumping

From a5697aef3232373ae82b209b1e8e80c5ccbdeb34 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 14 Dec 2023 18:05:01 +0000
Subject: [PATCH 18/22] Bump version 0.0.2

---
 packaging/rpm/rb-logstatter.spec | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index 382f697..2046c7a 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -46,6 +46,18 @@ systemctl start rb-logstatter
 - Update workflow
 - Add auto bumping
 - Bump version 0.0.2
+* Thu Dec 14 2023 Miguel Negron, Malvads, GitHub Actions <manegron@redborder.com, malvarez@redborder.com, actions@github.com> - 0.0.2
+- Trigger workflow
+- Update README
+- Delete chagelog tpm
+- Fix CI
+- Merge branch 'release/0.0.2' of github.com:redBorder/logstatter into release/0.0.2
+- Add build dates
+- Merge branch 'main' into release/0.0.2
+- Fix auto bumping
+- Update workflow
+- Add auto bumping
+- Bump version 0.0.2
 * Thu Dec 14 2023 Malvads, Miguel Negron <malvarez@redborder.com, manegron@redborder.com> - 0.0.2
 - Fix auto bumping
 - Add auto bumping

From 54f73a6e7aaa4db5f56952b7ea058760053febda Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Thu, 14 Dec 2023 18:12:49 +0000
Subject: [PATCH 19/22] Update workflow

---
 .github/workflows/buldrpm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 0e1dab6..820e94d 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -183,7 +183,7 @@ jobs:
           # Trim the trailing comma and space
           all_emails=${all_emails%, *}
 
-          echo -e "* $current_date $all_authors <$all_emails> - $VERSION" >> $changelog_file
+          echo -e "* $current_date $all_authors <$all_emails> - $VERSION-1" >> $changelog_file
           echo -e "$all_commits" >> $changelog_file
 
           spec_file=$(find . -type f -name "*.spec" | head -n 1)

From b3b58df5022011467fc4fdb9cef302621b1232db Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 14 Dec 2023 18:25:02 +0000
Subject: [PATCH 20/22] Bump version 0.0.2

---
 packaging/rpm/rb-logstatter.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index 7e54006..d98d5fd 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -34,5 +34,6 @@ systemctl start rb-logstatter
 /etc/logstatter/logstatter.conf
 %doc
 %changelog
+* Thu Dec 14 2023  <> - 0.0.2-1
 * Mon Dec 11 2023 Miguel Álvarez <malvarez@redborder.com> - 0.0.1-1
 - Initial package release

From 60fe1ae4d98616d06621d2e1d864ca11fb514661 Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Fri, 15 Dec 2023 10:08:55 +0000
Subject: [PATCH 21/22] Update workflow

---
 .github/workflows/buldrpm.yml    | 123 -------------------------------
 packaging/rpm/rb-logstatter.spec |   1 -
 2 files changed, 124 deletions(-)

diff --git a/.github/workflows/buldrpm.yml b/.github/workflows/buldrpm.yml
index 820e94d..3a2ee9d 100644
--- a/.github/workflows/buldrpm.yml
+++ b/.github/workflows/buldrpm.yml
@@ -17,11 +17,6 @@ jobs:
           fetch-depth: 0
           ref: 
 
-      - name: Set Git identity
-        run: |
-          git config --global user.email "actions@github.com"
-          git config --global user.name "GitHub Actions"
-
       - name: Check Branch and Target
         if: >
           github.event_name == 'pull_request' &&
@@ -30,27 +25,6 @@ jobs:
           (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main')
         run: echo "Running the workflow for branch ${GITHUB_HEAD_REF} to ${GITHUB_BASE_REF}" || (echo "Skipping workflow as the conditions are not met." && exit 0)
 
-      - name: Get Default Branch
-        id: get-default-branch
-        run: |
-          # Get the repository owner and name
-          REPO_OWNER=$(echo "${{ github.repository }}" | cut -d '/' -f 1)
-          REPO_NAME=$(echo "${{ github.repository }}" | cut -d '/' -f 2)
-
-          API_URL="https://api.github.com/repos/${REPO_OWNER}/${REPO_NAME}"
-          echo $API_URL
-          DEFAULT_BRANCH=$(curl -s "$API_URL" | jq -r '.default_branch')
-
-          echo "DEFAULT_BRANCH=${DEFAULT_BRANCH}" >> $GITHUB_ENV
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull default branch
-        run: |
-          git pull origin $DEFAULT_BRANCH
-        env:
-          DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
-
       - name: Create tag
         run: |
           git fetch --all --tags
@@ -120,103 +94,6 @@ jobs:
       - name: Delete not .rpm files
         run: |
           find ./rpms -type f -not -name '*.rpm' -exec rm {} \;
-
-      - name: Checkout to default branch
-        run: |
-          git checkout $DEFAULT_BRANCH
-        env:
-          DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
-
-      - name: Bump version with actions
-        run: |
-          git pull
-          git pull origin release/$VERSION
-          git checkout release/$VERSION
-          branch=$DEFAULT_BRANCH
-          tag=$(git tag -l '*.*.*' | grep -v '-' | sort -V | head -n -1 | tail -n 1)
-
-          if [ -z "$VERSION" ]; then
-            echo "Error: VERSION environment variable is not set."
-            exit 1
-          fi
-
-          changelog_file="changelog.tmp"
-          echo > $changelog_file
-
-          declare -A authors_commits
-          declare -A authors_emails
-          declare -A authors_names
-          IFS=$'\n'
-          for message in $(git log --pretty=format:"%h %s" $tag..$branch); do
-            commit_hash=$(echo "$message" | awk '{print $1}')
-            commit_subject=$(echo "$message" | sed 's/^[^ ]* //')
-            author_email=$(git log --pretty=format:"%ae" -n 1 $commit_hash)
-            author_name=$(git log --pretty=format:"%an" -n 1 --author="$author_email" $tag..$branch)
-            if [[ "$author_email" != *"noreply.github.com"* ]]; then
-              if ! grep -q "$author_name" "$changelog_file"; then
-                authors_names["$author_email"]=$author_name
-              fi
-
-              authors_commits["$author_email"]+="- $commit_subject\n"
-              authors_emails["$author_email"]=1
-            fi
-          done
-
-          current_date=$(date "+%a %b %d %Y")
-          all_authors=""
-          for author_email in "${!authors_commits[@]}"; do
-            all_authors+="${authors_names["$author_email"]}, "
-          done
-
-          all_authors=${all_authors%, *}
-
-          all_emails=""
-          for email in "${!authors_emails[@]}"; do
-            all_emails+="$email, "
-          done
-
-          all_commits=""
-          for commits in "${!authors_commits[@]}"; do
-            all_commits+="${authors_commits["$commits"]}"
-          done
-
-          # Trim the trailing comma and space
-          all_emails=${all_emails%, *}
-
-          echo -e "* $current_date $all_authors <$all_emails> - $VERSION-1" >> $changelog_file
-          echo -e "$all_commits" >> $changelog_file
-
-          spec_file=$(find . -type f -name "*.spec" | head -n 1)
-          changelog_section=$(awk '/%changelog/{p=1;next} p' $spec_file)
-
-          awk -v new_changelog="$(cat $changelog_file)" -v RS= -v ORS='\n\n' '{gsub(/%changelog/, "%changelog\n" new_changelog)} 1' $spec_file > temp_spec_file
-
-          awk '/^\* / {
-            if (last_line != $0) {
-              printf "%s\n", $0
-              last_line = $0
-            }
-            next
-          }
-          {
-            gsub(/^   - /, "- ")
-            sub(/^[[:space:]]+/, "")
-            if ($0 != "" && last_line != $0) {
-              print
-              last_line = $0
-            }
-          }' temp_spec_file > $spec_file
-
-          rm $changelog_file
-          rm temp_spec_file
-          git add $spec_file
-          git commit -m "Bump version $VERSION"
-          git push origin release/$VERSION
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ env.VERSION }}
-          DEFAULT_BRANCH: ${{ env.DEFAULT_BRANCH }}
       
       - name: Release
         uses: softprops/action-gh-release@v1
diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index d98d5fd..7e54006 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -34,6 +34,5 @@ systemctl start rb-logstatter
 /etc/logstatter/logstatter.conf
 %doc
 %changelog
-* Thu Dec 14 2023  <> - 0.0.2-1
 * Mon Dec 11 2023 Miguel Álvarez <malvarez@redborder.com> - 0.0.1-1
 - Initial package release

From 400872c5d6a52c6b017c096cf5dbaf38d170c6aa Mon Sep 17 00:00:00 2001
From: Malvads <malvarez@redborder.com>
Date: Fri, 15 Dec 2023 10:17:07 +0000
Subject: [PATCH 22/22] Fix spec file

---
 build.date                       |  2 --
 packaging/rpm/rb-logstatter.spec | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 build.date

diff --git a/build.date b/build.date
deleted file mode 100644
index fa741e2..0000000
--- a/build.date
+++ /dev/null
@@ -1,2 +0,0 @@
-14/12/2023 - 0.0.1
-14/12/2023 - 0.0.2
diff --git a/packaging/rpm/rb-logstatter.spec b/packaging/rpm/rb-logstatter.spec
index 7e54006..25f6538 100644
--- a/packaging/rpm/rb-logstatter.spec
+++ b/packaging/rpm/rb-logstatter.spec
@@ -3,36 +3,52 @@ Version:   %{__version}
 Release:   %{__release}%{?dist}
 BuildArch: x86_64
 Summary:   Logstatter service to monitor logstash
+
 License:   AGPL-3.0
 URL:       https://github.com/malvads/logstatter
 Source0:   %{name}-%{version}.tar.gz
+
 BuildRequires: perl gcc openssl-devel
+
 %global debug_package %{nil}
+
 %description
 %{summary}
+
 %prep
 %autosetup
+
 %build
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 source $HOME/.cargo/env
+
 cargo build --release
+
 %install
 install -D target/release/logstatter %{buildroot}/usr/bin/logstatter
 install -D -m 0644 src/systemd/rb-logstatter.service %{buildroot}/usr/lib/systemd/system/rb-logstatter.service
 install -D -m 0644 src/etc/logstatter.conf %{buildroot}/etc/logstatter/logstatter.conf
+
 %pre
 getent group logstatter >/dev/null || groupadd -r logstatter
 getent passwd logstatter >/dev/null || useradd -r -g logstatter -d /var/lib/logstatter -s /sbin/nologin -c "RedBorder Logstatter User" logstatter
+
 %post
 systemctl daemon-reload
 systemctl start rb-logstatter
+
 %files
 %defattr(0755,logstatter,logstatter)
 /usr/bin/logstatter
 %defattr(644,root,root)
 /usr/lib/systemd/system/rb-logstatter.service
 /etc/logstatter/logstatter.conf
+
 %doc
+
 %changelog
+* Fri Dec 15 2023 Miguel Álvarez <malvarez@redborder.com> - 0.0.2-1
+- Fix auto bumping
+
 * Mon Dec 11 2023 Miguel Álvarez <malvarez@redborder.com> - 0.0.1-1
 - Initial package release