Updated the way source and sums is precented.

Now using the haroopad.desktop file from the package instead for a custom one.

3 files changed, 18 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0251ccdbef9..8d7d698f434b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = haroopad
 	pkgdesc = A markdown enabled document processor
 	pkgver = 0.13.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://pad.haroopress.com/
 	install = haroopad.install
 	changelog = changelog
@@ -17,12 +17,12 @@ pkgbase = haroopad
 	depends = gtk2
 	depends = nss
 	options = !strip
-	source = https://bitbucket.org/rhiokim/haroopad-download/downloads/haroopad-v0.13.1-ia32.deb
-	source = haroopad.desktop
 	source = x-markdown.xml
-	sha256sums = bc8a162fbaa1f43e6b6f6a29b1be35df7eb87cf3988f14f4aaa1ecbb035f8ec6
-	sha256sums = 28f569d520f75e74485f1a7d55baf7b038c65fc82b4efbbef9bc882b26ddc9ed
 	sha256sums = 8261b526007db35c8691b3b6bf79cf40639a5e53fa81f1dd1fa4ea1cf5c440dd
+	source_i686 = https://bitbucket.org/rhiokim/haroopad-download/downloads/haroopad-v0.13.1-ia32.deb
+	sha256sums_i686 = bc8a162fbaa1f43e6b6f6a29b1be35df7eb87cf3988f14f4aaa1ecbb035f8ec6
+	source_x86_64 = https://bitbucket.org/rhiokim/haroopad-download/downloads/haroopad-v0.13.1-x64.deb
+	sha256sums_x86_64 = ff04f500d6809491d1154bccc8c1ee1f02139a845290774d49ddd6f4c042832a
 
 pkgname = haroopad
 
diff --git a/PKGBUILD b/PKGBUILD
index 6e6293d2af74..99c85765c90a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,11 @@
 
 pkgname=haroopad
 pkgver=0.13.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A markdown enabled document processor"
 arch=('i686' 'x86_64')
 url="http://pad.haroopress.com/"
+changelog=('changelog')
 license=('custom')
 depends=('xdg-utils'
          'desktop-file-utils'
@@ -19,18 +20,14 @@ depends=('xdg-utils'
          'nss')
 options=('!strip')
 install=${pkgname}.install
-changelog=changelog
-source=("https://bitbucket.org/rhiokim/haroopad-download/downloads/${pkgname}-v${pkgver}-ia32.deb"
-	    "haroopad.desktop"
-	    "x-markdown.xml")
-sha256sums=('bc8a162fbaa1f43e6b6f6a29b1be35df7eb87cf3988f14f4aaa1ecbb035f8ec6'
-            '28f569d520f75e74485f1a7d55baf7b038c65fc82b4efbbef9bc882b26ddc9ed'
-            '8261b526007db35c8691b3b6bf79cf40639a5e53fa81f1dd1fa4ea1cf5c440dd')
 
-if [[ ${CARCH} = x86_64 ]]; then
-	source[0]="https://bitbucket.org/rhiokim/haroopad-download/downloads/${pkgname}-v${pkgver}-x64.deb"
-	sha256sums[0]='ff04f500d6809491d1154bccc8c1ee1f02139a845290774d49ddd6f4c042832a'
-fi
+source=("x-markdown.xml")
+source_i686=("https://bitbucket.org/rhiokim/haroopad-download/downloads/${pkgname}-v${pkgver}-ia32.deb")
+source_x86_64=("https://bitbucket.org/rhiokim/haroopad-download/downloads/${pkgname}-v${pkgver}-x64.deb")
+
+sha256sums=('8261b526007db35c8691b3b6bf79cf40639a5e53fa81f1dd1fa4ea1cf5c440dd')
+sha256sums_i686=('bc8a162fbaa1f43e6b6f6a29b1be35df7eb87cf3988f14f4aaa1ecbb035f8ec6')
+sha256sums_x86_64=('ff04f500d6809491d1154bccc8c1ee1f02139a845290774d49ddd6f4c042832a')
 
 build() {
 	cd "${srcdir}"
@@ -40,18 +37,10 @@ build() {
 package() {
 	cd "${srcdir}"
 	cp -r "${srcdir}/usr" "${pkgdir}/usr"
-	sed -i -e 's/libudev.so.0/libudev.so.1/g' \
-	       "${pkgdir}/usr/share/haroopad/haroopad"
+	sed -i -e 's/libudev.so.0/libudev.so.1/g' "${pkgdir}/usr/share/haroopad/haroopad"
 	rm "${pkgdir}/usr/share/applications/mimeapps.list"
-	rm "${pkgdir}/usr/share/applications/Haroopad.desktop"
 	mkdir "${pkgdir}/usr/share/doc/haroopad/"
-	mv "${pkgdir}/usr/share/doc/changelog" \
-	   "${pkgdir}/usr/share/doc/copyright" \
-	   "${pkgdir}/usr/share/doc/haroopad/"
-	install -Dm644 x-markdown.xml \
-		"${pkgdir}/usr/share/mime/packages/x-markdown.xml"
-	install -Dm644 haroopad.desktop \
-		"${pkgdir}/usr/share/applications/haroopad.desktop"
-	install -Dm644 "${pkgdir}/usr/share/doc/haroopad/copyright" \
-		"${pkgdir}/usr/share/licenses/haroopad/LICENSE"
+	mv "${pkgdir}/usr/share/doc/changelog" "${pkgdir}/usr/share/doc/copyright" "${pkgdir}/usr/share/doc/haroopad/"
+	install -Dm644 x-markdown.xml "${pkgdir}/usr/share/mime/packages/x-markdown.xml"
+	install -Dm644 "${pkgdir}/usr/share/doc/haroopad/copyright" "${pkgdir}/usr/share/licenses/haroopad/LICENSE"
 }
\ No newline at end of file
diff --git a/haroopad.desktop b/haroopad.desktop
deleted file mode 100644
index b3c08773ed3c..000000000000
--- a/haroopad.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=haroopad
-Version=0.12.2
-Exec=haroopad %F
-Comment=The Next Document processor based on Markdown
-Icon=haroopad
-Type=Application
-Terminal=false
-StartupNotify=true
-Categories=Development;GTK;GNOME;
-MimeType=text/x-markdown;
\ No newline at end of file