Merge branch 'master' of https://gitlab.com/b0/spectral

flatpak/org.eu.encom.spectral.yaml

@@ -9,7 +9,7 @@ finish-args:
 - --socket=x11
 - --socket=wayland
 - --device=dri
-- --filesystem=home
+- --filesystem=xdg-download
 - --talk-name=org.freedesktop.Notifications
 - --talk-name=org.kde.StatusNotifierWatcher
 modules:

org.eu.encom.spectral.appdata.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
   <id>org.eu.encom.spectral</id>
-  <launchable type="desktop-id">org.eu.encom.spectral.desktop</launchable>
+
-  <metadata_license>GFDL</metadata_license>
+  <provides>
-  <project_license>GPL-3.0</project_license>
+    <binary>spectral</binary>
+  </provides>
+
   <name>Spectral</name>
   <summary>IM client for the Matrix protocol</summary>
   <description>
@@ -14,6 +16,21 @@
       The source code is generally available at https://gitlab.com/b0/spectral
     </p>
   </description>
+
+  <url type="homepage">https://gitlab.com/b0/spectral</url>
+  <url type="bugtracker">https://gitlab.com/b0/spectral/issues</url>
+  <url type="help">https://doc.spectral.encom.eu.org</url>
+
+  <categories>
+    <category>Matrix</category>
+    <category>Internet</category>
+    <category>Qt</category>
+  </categories>
+
+  <developer_name>Black Hat</developer_name>
+  <metadata_license>GFDL</metadata_license>
+  <project_license>GPL-3.0</project_license>
+
   <screenshots>
     <screenshot type="default">
       <caption>Overview</caption>
@@ -24,25 +41,15 @@
       <image>https://gitlab.com/b0/spectral/raw/master/screenshots/2.png</image>
     </screenshot>
   </screenshots>
-  <developer_name>Black Hat</developer_name>
+
-  <categories>
-    <category>Matrix</category>
-    <category>Internet</category>
-    <category>Qt</category>
-  </categories>
-  <url type="homepage">https://gitlab.com/b0/spectral</url>
-  <url type="bugtracker">https://gitlab.com/b0/spectral/issues</url>
-  <url type="help">https://doc.spectral.encom.eu.org</url>
   <content_rating type="oars-1.0">
     <content_attribute id="social-chat">intense</content_attribute>
     <content_attribute id="social-audio">intense</content_attribute>
   </content_rating>
+
   <releases>
-    <release version="436" date="2018-10-20" type="stable"></release>
+    <release version="464" date="2018-10-24"></release>
-    <release version="250" date="2018-09-05" type="stable"></release>
+    <release version="462" date="2018-10-24"></release>
-    <release version="218" date="2018-08-24" type="stable"></release>
+    <release version="436" date="2018-10-20"></release>
-    <release version="215" date="2018-08-24" type="stable"></release>
-    <release version="200" date="2018-08-19" type="stable"></release>
-    <release version="187" date="2018-08-17" type="stable"></release>
   </releases>
 </component>

spectral.pro

@@ -59,7 +59,12 @@ unix:!mac:isEmpty(PREFIX) {
     message("Install PREFIX not set; using /usr/local. You can change this with 'qmake PREFIX=...'")
     PREFIX = /usr/local
 }
-unix:target.path = $$PREFIX/bin
+unix:!mac:isEmpty(BINDIR) {
+    message("Install BINDIR not set; using PREFIX/bin. You can change this with 'qmake BINDIR=...'")
+    BINDIR = $$PREFIX/bin
+}
+unix:!mac:target.path = $$BINDIR
+mac:target.path = $$PREFIX/bin
 win32:target.path = $$PREFIX
 !isEmpty(target.path): INSTALLS += target