Push commits from devel to master branch for v0.3.2 (#361)

* [Changelog] Final update for v0.3.1 (#353) * [harbour-storeman.ts] Fix typo & beautify (#347) * [harbour-storeman.qml] Eliminate last stale link (#354) to https://github.com/mentaljam/harbour-storeman instead of https://github.com/storeman-developers/harbour-storeman * Enhance comments WRT Qt-ToDos (#357) Update comments WRT Qt ≥ 5.9 * Enhance spec file a bit, requires Installer ≥ 1.3.0 (#360) * [Changelog] Create entry for v0.3.2 * Update harbour-storeman.changes * Version increase to 0.3.2-1 * Update harbour-storeman.changes * Finalise changelog entries for v0.3.2
storeman-developers · Nov 29, 2022 · 1e9a2f8 · 1e9a2f8
2 parents 453b2de + 4ee5903
commit 1e9a2f8
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 19 deletions.
diff --git a/qml/harbour-storeman.qml b/qml/harbour-storeman.qml
@@ -9,7 +9,8 @@ import "pages"
 ApplicationWindow
 {
     property bool manualUnusedCheck
-    // TODO: Use Qt.application.displayName (available since Qt 5.9)
+    // Qt.application.displayName (available since Qt 5.9) cannot be used, because SFOS 4.4.0 still deploys QT 5.6 and Storeman supports SFOS ≥ 3.1.0!
+    // For a detailed discussion see https://github.com/storeman-developers/harbour-storeman/issues/356#issuecomment-1192249781
     readonly property string applicationDisplayName: "Storeman"
     readonly property string applicationIcon: Qt.application.name
     readonly property string dbusService: "harbour.storeman.service"
@@ -150,7 +151,7 @@ ApplicationWindow
         <doc:doc>
           <doc:summary>
             Name of the page to open
-            (https://github.com/mentaljam/harbour-storeman/tree/master/qml/pages)
+            (https://github.com/storeman-developers/harbour-storeman/tree/master/qml/pages)
           </doc:summary>
         </doc:doc>
       </arg>

diff --git a/rpm/harbour-storeman.changes b/rpm/harbour-storeman.changes
@@ -1,9 +1,17 @@
+* Sun Jul 24 2022 olf <https://github.com/Olf0> 0.3.2
+- [Changelog] Final update for v0.3.1 (#353, #330)
+- [harbour-storeman.ts] Fix typo & beautify (#347) 
+- [harbour-storeman.qml] Eliminate last stale link (#354)
+- Enhance comments WRT Qt-ToDos (#357)
+- Enhance spec file a bit, requires Installer ≥ 1.3.0 (#360) 
+
 * Sun Jul 17 2022 olf <https://github.com/Olf0> 0.3.1
-- Update contributors' copyright notices in license file (#313)
-- Re-introduce donation button (#322)
-- Update changelog for v0.3.0 and v0.3.1 (#329)
+- [LICENSE] Update contributors' copyright notices (#313)
+- [AboutPage.qml] Re-introduce donation button (#322)
 - Shorten a few strings (#327, #332, #333)
+- [Changelog] Update v0.3.0 and v0.3.1 (#329)
 - [AboutPage.qml] Beautify vertical spacing (#340)
+- [AboutPage.qml] Increase icon size (#341)
 
 * Sat May 14 2022 olf <https://github.com/Olf0> 0.3.0
 - Add 8 screenshots, plus social media icons (#216, #232, #238) 

diff --git a/rpm/harbour-storeman.spec b/rpm/harbour-storeman.spec
@@ -1,7 +1,7 @@
 Name:           harbour-storeman
 Summary:        OpenRepos client application for SailfishOS
-Version:        0.3.1
-Release:        3
+Version:        0.3.2
+Release:        1
 Group:          Applications/System
 License:        MIT
 URL:            https://github.com/storeman-developers/harbour-storeman
@@ -81,16 +81,22 @@ make %{?_smp_mflags}
 desktop-file-install --delete-original --dir=%{buildroot}%{_datadir}/applications \
    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%posttrans
-ssu rr mentaljam-obs
-rm -f /var/cache/ssu/features.ini
-ssu ar harbour-storeman-obs 'https://repo.sailfishos.org/obs/home:/olf:/harbour-storeman/%%(release)_%%(arch)/'
-ssu ur
+%post
+if [ "$1" = "1" ] # Installation
+then
+  ssu rr mentaljam-obs
+  rm -f /var/cache/ssu/features.ini
+  ssu ar harbour-storeman-obs 'https://repo.sailfishos.org/obs/home:/olf:/harbour-storeman/%%(release)_%%(arch)/'
+  ssu ur
+fi
 
 %postun
-ssu rr harbour-storeman-obs
-rm -f /var/cache/ssu/features.ini
-ssu ur
+if [ "$1" = "0" ] # Removal
+then
+  ssu rr harbour-storeman-obs
+  rm -f /var/cache/ssu/features.ini
+  ssu ur
+fi
 
 %files
 %defattr(-,root,root,-)

diff --git a/src/harbour-storeman.cpp b/src/harbour-storeman.cpp
@@ -56,8 +56,9 @@ int main(int argc, char *argv[])
 
     SailfishApp::application(argc, argv);
     QGuiApplication::setApplicationVersion(QStringLiteral(STOREMAN_VERSION));
-    // TODO: Available in Qt.application object since Qt 5.9
-    // QGuiApplication::setApplicationDisplayName(QStringLiteral("Storeman"));
+    // QGuiApplication::setApplicationDisplayName(QStringLiteral("Storeman")); (available in Qt.application object since Qt 5.9) cannot be used, 
+    // because SFOS 4.4.0 still deploys QT 5.6 and Storeman supports SFOS ≥ 3.1.0!
+    // For a detailed discussion see https://github.com/storeman-developers/harbour-storeman/issues/356#issuecomment-1192249781
 
     auto view = SailfishApp::createView();
 

diff --git a/translations/harbour-storeman.ts b/translations/harbour-storeman.ts
@@ -118,7 +118,7 @@
     </message>
     <message id="orn-dt-format">
         <source>yyyy-MM-dd hh:mm</source>
-        <extracomment>Output format for the date labels. For details visit https://doc.qt.io/qt-5/qdate.html#toString</extracomment>
+        <extracomment>Output format for the date labels.  For details visit https://doc.qt.io/qt-5/qdate.html#toString</extracomment>
         <translation>yyyy-MM-dd hh:mm</translation>
     </message>
     <message id="orn-version-noavailable">
@@ -537,7 +537,7 @@
     </message>
     <message id="orn-error-depresolution">
         <source>Nothing provides %1 needed by %2</source>
-        <extracomment>A template string for a dependecy resolution error. %1 is a dependency and %2 is a failed package.</extracomment>
+        <extracomment>A template string for a dependency resolution error.  %1 is a dependency and %2 is a failed package.</extracomment>
         <translation>Nothing provides %1 needed by %2</translation>
     </message>
     <message id="orn-backups">