Adopt Package, cleanup; edit the desktop shortcut name to Redshift Qt

2 files changed, 16 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db347c987b01..389bfc41ea83 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = redshift-qt
 	pkgdesc = redshift-gtk rewrite with C++/Qt
 	pkgver = 0.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Chemrat/redshift-qt
 	arch = x86_64
 	arch = i686
 	license = MIT
-	depends = redshift
 	depends = qt5-base
-	source = redshift-qt-0.6.tar.gz::https://github.com/Chemrat/redshift-qt/archive/v0.6.tar.gz
+	depends = redshift
+	source = https://github.com/Chemrat/redshift-qt/archive/v0.6.tar.gz
 	sha512sums = f240f5efa7d5e1aec4b4dee0e7b14b3097147d1a601afef27c33eaec06df9a8ed340f26b56b27e0c012717451b5b3f7e2d45ef59c85a6512f98b5e613fb397af
 
 pkgname = redshift-qt
-
diff --git a/PKGBUILD b/PKGBUILD
index 625774cf1b78..dba727667642 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,28 @@
 
 pkgname=redshift-qt
 pkgver=0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="redshift-gtk rewrite with C++/Qt"
 arch=('x86_64' 'i686')
 url="https://github.com/Chemrat/redshift-qt"
 license=('MIT')
-depends=('redshift' 'qt5-base')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/Chemrat/redshift-qt/archive/v$pkgver.tar.gz")
+depends=('qt5-base' 'redshift')
+source=("$url/archive/v$pkgver.tar.gz")
 sha512sums=('f240f5efa7d5e1aec4b4dee0e7b14b3097147d1a601afef27c33eaec06df9a8ed340f26b56b27e0c012717451b5b3f7e2d45ef59c85a6512f98b5e613fb397af')
 
+prepare() {
+  sed -i -E "s|Name=Redshift|Name=Redshift Qt|g" $pkgname-$pkgver/data/$pkgname.desktop
+}
+
 build() {
-  cd "$pkgname-$pkgver"
-  qmake redshift-qt.pro
+  cd $pkgname-$pkgver
+  qmake $pkgname.pro
   make
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-  install -Dm755 redshift-qt "$pkgdir/usr/bin/redshift-qt"
-  install -Dm644 data/redshift-qt.desktop "$pkgdir/usr/share/applications/redshift-qt.desktop"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  cd $pkgname-$pkgver
+  install -Dm644 data/$pkgname.desktop -t "$pkgdir/usr/share/applications"
+  install -Dm644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm755 $pkgname -t "$pkgdir/usr/bin"
 }
-
-# vim:set ts=2 sw=2 et: