From fe8b27d18cf862baffe3428efcec4157c2c996fe Mon Sep 17 00:00:00 2001
From: Matti Viljanen <matti.viljanen@kapsi.fi>
Date: Mon, 23 Mar 2020 04:04:47 +0200
Subject: [PATCH] Fix crash on startup

---
 qml/pages/AboutPage.qml              | 2 +-
 rpm/harbour-batterybuddy.changes     | 4 ++++
 rpm/harbour-batterybuddy.spec        | 6 +++---
 service/harbour-batterybuddy.service | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/qml/pages/AboutPage.qml b/qml/pages/AboutPage.qml
index fef5beb..1100bd5 100644
--- a/qml/pages/AboutPage.qml
+++ b/qml/pages/AboutPage.qml
@@ -72,7 +72,7 @@ Page {
             AboutLabel {
                 font.pixelSize: Theme.fontSizeSmall
                 color: Theme.secondaryColor
-                text: qsTr("Version") + " 2.1-1"
+                text: qsTr("Version") + " 2.1-2"
             }
 
             AboutLabel {
diff --git a/rpm/harbour-batterybuddy.changes b/rpm/harbour-batterybuddy.changes
index 9f74e67..4c6ea89 100644
--- a/rpm/harbour-batterybuddy.changes
+++ b/rpm/harbour-batterybuddy.changes
@@ -1,3 +1,7 @@
+* Sat Mar 21 2020 Matti Viljanen (direc85) <matti.viljanen@kapsi.fi> 2.1-2
+- Fix crash on startup after upgrade
+- Fix missing systemd service after upgrade
+
 * Sat Mar 21 2020 Matti Viljanen (direc85) <matti.viljanen@kapsi.fi> 2.1-1
 - Add landscape orientation support
 - Update Chinese translation (thanks, dashinfantry)
diff --git a/rpm/harbour-batterybuddy.spec b/rpm/harbour-batterybuddy.spec
index 74727b5..725e857 100644
--- a/rpm/harbour-batterybuddy.spec
+++ b/rpm/harbour-batterybuddy.spec
@@ -14,7 +14,7 @@ Name:       harbour-batterybuddy
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Battery Buddy
 Version:    2.1
-Release:    1
+Release:    2
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/
@@ -70,10 +70,10 @@ desktop-file-install --delete-original       \
 # >> files
 # << files
 
-%post
+%posttrans
+systemctl disable --now harbour-batterybuddy.service
 cp %{_datadir}/%{name}/service/harbour-batterybuddy.service /etc/systemd/system/
 chmod 755 %{_datadir}/%{name}/service/*.sh
-systemctl disable --now harbour-batterybuddy.service
 systemctl enable --now harbour-batterybuddy.service
 
 %postun
diff --git a/service/harbour-batterybuddy.service b/service/harbour-batterybuddy.service
index b925c17..cce19c8 100644
--- a/service/harbour-batterybuddy.service
+++ b/service/harbour-batterybuddy.service
@@ -15,7 +15,7 @@
 # Author: Matti Viljanen
 
 [Unit]
-Description=Allow user nemo to write to charging control file
+Description=Battery Buddy file permission daemon
 
 [Service]
 Type=oneshot