summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin MacMartin2017-03-30 17:56:50 -0400
committerKevin MacMartin2017-03-30 17:56:50 -0400
commit9dcd10724d99a5ff7fed1762acd1d02df064b60b (patch)
treef8913bc2b9ea211ce206a8798c0a8bb248ee8ecf
parented6e7cf00be985b1098cc3659473c1beaa3a62bd (diff)
downloadaur-9dcd10724d99a5ff7fed1762acd1d02df064b60b.tar.gz
Pull in the changes made in the patch by A.Shukaev and fix the SRCINFO
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD8
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93b91cb7aa69..705b44878cc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Mar 28 17:44:39 UTC 2017
+# Thu Mar 30 21:55:33 UTC 2017
pkgbase = conky-colors-git
pkgdesc = An easier way to configure Conky
pkgver = 20160428.r157.df2bb4b
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/helmuthdu/conky_colors
install = conky-colors-git.install
arch = armv6h
@@ -16,6 +16,7 @@ pkgbase = conky-colors-git
depends = conky
depends = pystatgrab
depends = python2-keyring
+ depends = ttf-liberation
depends = ttf-ubuntu-font-family
depends = hddtemp
depends = curl
diff --git a/PKGBUILD b/PKGBUILD
index f8ae0ee60e49..c0fbc75e6eb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
# Maintainer: Kevin MacMartin <prurigro@gmail.com>
+# Contributor: A.Shukaev
_pkgname=conky-colors
pkgname=$_pkgname-git
@@ -8,7 +9,7 @@ pkgdesc='An easier way to configure Conky'
url='https://github.com/helmuthdu/conky_colors'
license=('GPL3')
arch=('armv6h' 'armv7h' 'arm' 'i686' 'x86_64')
-depends=('python' 'conky' 'pystatgrab' 'python2-keyring' 'ttf-ubuntu-font-family' 'hddtemp' 'curl' 'lm_sensors')
+depends=('python' 'conky' 'pystatgrab' 'python2-keyring' 'ttf-liberation' 'ttf-ubuntu-font-family' 'hddtemp' 'curl' 'lm_sensors')
provides=("$_pkgname")
conflicts=("$_pkgname")
source=("git+$url.git")
@@ -22,12 +23,13 @@ pkgver() {
prepare() {
cd ${_pkgname/-/_}
- sed -i 's|\(ln -[^ ]* \)\$(DESTDIR)|\1/usr|;s|\$(DESTDIR)/bin|\$(DESTDIR)/usr/bin|' Makefile
+ sed -i 's|\(ln\s\+-\S\+\s\+\)\$(DESTDIR)|\1|' Makefile
+ sed -i 's|\(PREFIX\s*\):\?=|\1?=|' Makefile
}
build() {
cd ${_pkgname/-/_}
- make
+ make PREFIX=/usr
}
package() {