Move to actual .desktop file

4 files changed, 20 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41f627f5f51f..6b50de9d121a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,6 +8,10 @@ pkgbase = apachedirectorystudio
 	license = Apache
 	depends = java-runtime
 	depends = gtk2
+	source = apachedirectorystudio.desktop
+	source = apachedirectorystudio.png
+	sha256sums = d0a241c30b2a04a2d7f05f6d0f53de966138095e062a59266cf90750549bfc88
+	sha256sums = 400929c64547773a1bba1c82f7c12f9cd55f2a68b43f5fcebc3c4d07cbe6549b
 	source_i686 = http://www.us.apache.org/dist/directory/studio/2.0.0.v20170904-M13/ApacheDirectoryStudio-2.0.0.v20170904-M13-linux.gtk.x86.tar.gz
 	sha256sums_i686 = 96281c2af3b1ea04e423b41b465a93b21607ce41b3dc3771861e0b52557eb5af
 	source_x86_64 = http://www.us.apache.org/dist/directory/studio/2.0.0.v20170904-M13/ApacheDirectoryStudio-2.0.0.v20170904-M13-linux.gtk.x86_64.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 36afdf0925c9..3fb2d4a21056 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,8 +14,11 @@ arch=('i686' 'x86_64')
 url="http://directory.apache.org/studio/"
 license=('Apache')
 depends=('java-runtime' 'gtk2')
+source=('apachedirectorystudio.desktop' 'apachedirectorystudio.png')
 source_i686=("http://www.us.apache.org/dist/directory/studio/$_pkgver/$_pkgname-$_pkgver-linux.gtk.x86.tar.gz")
 source_x86_64=("http://www.us.apache.org/dist/directory/studio/$_pkgver/$_pkgname-$_pkgver-linux.gtk.x86_64.tar.gz")
+sha256sums=('d0a241c30b2a04a2d7f05f6d0f53de966138095e062a59266cf90750549bfc88'
+            '400929c64547773a1bba1c82f7c12f9cd55f2a68b43f5fcebc3c4d07cbe6549b')
 sha256sums_i686=('96281c2af3b1ea04e423b41b465a93b21607ce41b3dc3771861e0b52557eb5af')
 sha256sums_x86_64=('581d55f3496827710301dec613466d829cf9a3ed3d4308460e63ca08aaa9d6c9')
 
@@ -27,17 +30,7 @@ package() {
 
   ln -sf /opt/$_pkgname/$_pkgname usr/bin/$_pkgname
   ln -sf /opt/$_pkgname/$_pkgname usr/bin/$pkgname
-
-  cat > usr/share/applications/$_pkgname.desktop <<EOF
-[Desktop Entry]
-Version=$_pkgver
-Encoding=UTF-8
-Name=Apache Directory Studio
-Comment=$pkgdesc
-Exec=/opt/$_pkgname/$_pkgname
-Icon=/opt/ApacheDirectoryStudio/features/org.apache.directory.studio.ldapbrowser.feature_$_pkgver/studio.png
-Terminal=false
-Type=Application
-Categories=Java;Network;
-EOF
+  
+  install -Dm644 "$srcdir"/apachedirectorystudio.desktop "$pkgdir"/usr/share/applications/apachedirectorystudio.desktop
+  install -Dm644 "$srcdir"/apachedirectorystudio.png "$pkgdir"/usr/share/pixmaps/apachedirectorystudio.png
 }
diff --git a/apachedirectorystudio.desktop b/apachedirectorystudio.desktop
new file mode 100644
index 000000000000..fd1431576766
--- /dev/null
+++ b/apachedirectorystudio.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Apache Directory Studio
+Comment=Eclipse based LDAP browser and directory client
+Exec=apachedirectorystudio
+Icon=/usr/share/pixmaps/apachedirectorystudio.png
+Terminal=false
+Type=Application
+Categories=Java;Network;
+StartupNotify=false
diff --git a/apachedirectorystudio.png b/apachedirectorystudio.png
new file mode 100644
index 000000000000..7a04ef40d1b9
--- /dev/null
+++ b/apachedirectorystudio.png