summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Pulliam2016-03-26 23:40:57 -0600
committerMichael Pulliam2016-03-26 23:40:57 -0600
commitf008acdbc3464a1c9c515e11361af0f5643eb720 (patch)
tree2796471ccbcdcfaeb2858e9097427dc81bd2c92c
parente03b396e3d4c335d8087fa3988ad88d31a48c1ad (diff)
downloadaur-f008acdbc3464a1c9c515e11361af0f5643eb720.tar.gz
Updated to rel 3 - Fixed line wrapping
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD20
2 files changed, 8 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3060c2ef78fe..7efee87beac8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = conky-lua
pkgdesc = Lightweight system monitor for X, with Lua support enabled
pkgver = 1.10.1
- pkgrel = 2
+ pkgrel = 3
url = http://github.com/brndnmtthws/conky
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index a572dcf76a57..1a3275dd3e47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=conky-lua
_pkgname=conky
pkgver=1.10.1
-pkgrel=2
+pkgrel=3
pkgdesc='Lightweight system monitor for X, with Lua support enabled'
url='http://github.com/brndnmtthws/conky'
license=('BSD' 'GPL3')
@@ -11,8 +11,7 @@ arch=('i686' 'x86_64')
options=('!emptydirs')
makedepends=('docbook2x' 'tolua++' 'perl-xml-libxml' 'cmake'
'docbook-xsl' 'docbook-xml' 'perl-xml-libxml')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2'
-'libxdamage' 'imlib2' 'lua51' 'cairo')
+depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2' 'lua51' 'cairo')
provides=('conky=1.10.1')
conflicts=('conky')
backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
@@ -24,8 +23,7 @@ replaces=('torsmo')
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
- CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" LUA_LIBS="-llua5.1"
-LUA_CFLAGS="-I/usr/include/lua5.1" \
+ CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" LUA_LIBS="-llua5.1" LUA_CFLAGS="-I/usr/include/lua5.1" \
cmake \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_BUILD_TYPE=Release \
@@ -48,14 +46,10 @@ LUA_CFLAGS="-I/usr/include/lua5.1" \
package() {
cd "${srcdir}/${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING
-"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- install -Dm644 LICENSE.BSD
-${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.BSD
- install -Dm644 extras/vim/syntax/conkyrc.vim
-"${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
- install -Dm644 extras/vim/ftdetect/conkyrc.vim
-"${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 LICENSE.BSD ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.BSD
+ install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+ install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
}
prepare() {