4 files changed, 33 insertions, 17 deletions

diff --git a/applications/kube/CMakeLists.txt b/applications/kube/CMakeLists.txt
index 3e5e1d57..4495d842 100644
--- a/applications/kube/CMakeLists.txt
+++ b/applications/kube/CMakeLists.txt
@@ -23,5 +23,21 @@ target_link_libraries(${PROJECT_NAME}
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(PROGRAMS org.kde.kube.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-install(FILES org.kde.kube.appdata.xml DESTINATION ${KDE_INSTALL_DATAROOTDIR}/appdata/)
+set(KUBE_APPLICATION_ID "org.kde.kube" CACHE STRING "The application identifier used for desktopfile and appdata")
+
+set(KUBE_DESKTOPFILE_NAME "Kube" CACHE STRING "desktopfile name property")
+set(KUBE_DESKTOPFILE_GENERICNAME "Mail Client" CACHE STRING "desktopfile genericname property")
+set(KUBE_DESKTOPFILE_COMMENT "Send, receive and manage your mail with Kube" CACHE STRING "desktopfile comment property")
+set(KUBE_DESKTOPFILE_CATEGORIES "Qt;KDE;Office;Network;Email;" CACHE STRING "desktopfile categories property")
+set(KUBE_DESKTOPFILENAME "${KUBE_APPLICATION_ID}.desktop")
+configure_file(kube.desktop.in ${KUBE_DESKTOPFILENAME})
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${KUBE_DESKTOPFILENAME} DESTINATION ${KDE_INSTALL_APPDIR} )
+
+set(KUBE_APPDATA_ID "${KUBE_DESKTOPFILENAME}" CACHE STRING "appdata homepage property")
+set(KUBE_APPDATA_HOMEPAGE "https://kube.kde.org" CACHE STRING "appdata homepage property")
+set(KUBE_APPDATA_BUGTRACKER "https://phabricator.kde.org/project/view/238/" CACHE STRING "appdata bugtracker property")
+set(KUBE_APPDATA_HELP "http://api.kde.org/doc/kube/" CACHE STRING "appdata help property")
+set(KUBE_APPDATA_PROJECTGROUP "KDE" CACHE STRING "appdata projectgroup property")
+set(KUBE_APPDATAFILENAME "${KUBE_APPLICATION_ID}.appdata.xml")
+configure_file(kube.appdata.xml.in ${KUBE_APPDATAFILENAME})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${KUBE_APPDATAFILENAME} DESTINATION ${KDE_INSTALL_DATAROOTDIR}/appdata/)
diff --git a/applications/kube/org.kde.kube.appdata.xml b/applications/kube/kube.appdata.xml.in
index 82431cd5..f6580a09 100644
--- a/applications/kube/org.kde.kube.appdata.xml
+++ b/applications/kube/kube.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component type="desktop">
-  <id>org.kde.kube.desktop</id>
+  <id>@KUBE_APPDATA_ID@</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Kube</name>
@@ -9,10 +9,10 @@
     <p>Kube is a modern communication and collaboration client built with QtQuick on top of a high performance, low resource usage core. It provides online and offline access to all your mail, contacts, calendars, notes, todo's and more. With a strong focus on usability, the team works with designers and UX experts from the ground up, to build a product that is not only visually appealing but also a joy to use.</p>
     <p>Communication and collaboration within large groups and spread over several time zones is complex and something of the norm in modern projects and the existing solutions available are not up to that challenge. Kube is a way to simplify and make communication elegant again by focusing on the key needs of users instead of filling it with any feature that comes to mind. Our strict focus on what is actually needed instead of what is wanted brings a new way of collaboration between group members and a simpler way of handling communication.</p>
   </description>
-  <url type="homepage">https://kube.kde.org</url>
-  <url type="bugtracker">https://bugs.kde.org/enter_bug.cgi?format=guided&amp;product=kube</url>
-  <url type="help">http://api.kde.org/doc/kube/</url>
-  <project_group>KDE</project_group>
+  <url type="homepage">@KUBE_APPDATA_HOMEPAGE@</url>
+  <url type="bugtracker">@KUBE_APPDATA_BUGTRACKER@</url>
+  <url type="help">@KUBE_APPDATA_HELP@</url>
+  <project_group>@KUBE_APPDATA_PROJECTGROUP@</project_group>
   <provides>
     <binary>kube</binary>
   </provides>
diff --git a/applications/kube/kube.desktop.in b/applications/kube/kube.desktop.in
new file mode 100755
index 00000000..05c5e2a9
--- /dev/null
+++ b/applications/kube/kube.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=@KUBE_DESKTOPFILE_NAME@
+Type=Application
+Exec=kube
+Icon=kube_icon
+GenericName=@KUBE_DESKTOPFILE_GENERICNAME@
+Comment=@KUBE_DESKTOPFILE_COMMENT@
+Terminal=false
+StartupNotify=true
+Categories=@KUBE_DESKTOPFILE_CATEGORIES@
diff --git a/applications/kube/org.kde.kube.desktop b/applications/kube/org.kde.kube.desktop
deleted file mode 100755
index 290fd503..00000000
--- a/applications/kube/org.kde.kube.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Kube
-Type=Application
-Exec=kube
-Icon=kube_icon
-GenericName=Mail Client
-Comment=Send, receive and manage your mail with Kube
-Terminal=false
-StartupNotify=true
-Categories=Qt;KDE;Office;Network;Email;