summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rwxr-xr-xprepare4uploadpkg.sh2
3 files changed, 6 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a47b5b512158..cef57dd6cbf9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = conky-lua-archers-git
pkgdesc = A free, light-weight system monitor for X with lua enabled for Arch based distros
- pkgver = 3169.262a2925
+ pkgver = 3185.ac56f205
pkgrel = 1
url = https://github.com/brndnmtthws/conky/
arch = i686
@@ -39,9 +39,7 @@ pkgbase = conky-lua-archers-git
options = !strip
options = debug
source = git://github.com/brndnmtthws/conky.git
- source = asciime.patch
sha1sums = SKIP
- sha1sums = b07407c2be11cee7bd50e046024b89cf2579c448
pkgname = conky-lua-archers-git
diff --git a/PKGBUILD b/PKGBUILD
index 5b7a9d78422b..c83fe07fe9e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
pkgname=conky-lua-archers-git
_pkgname=conky
-pkgver=3169.262a2925
+pkgver=3185.ac56f205
pkgrel=1
pkgdesc="A free, light-weight system monitor for X with lua enabled for Arch based distros"
arch=('i686' 'x86_64')
url="https://github.com/brndnmtthws/conky/"
license=('GPL3' 'BSD')
replaces=('torsmo' 'conky')
-conflicts=('conky' 'conky-lua' 'conky-lua-arch' 'conky-lua-nv' 'conky-lua-archers')
provides=('conky')
+conflicts=('conky' 'conky-lua' 'conky-lua-arch' 'conky-lua-nv' 'conky-lua-archers')
depends=(
'alsa-lib'
'cairo'
@@ -37,10 +37,8 @@ makedepends=(
'perl-xml-libxml'
'perl-xml-sax-expat'
)
-source=("git://github.com/brndnmtthws/${_pkgname}.git"
- 'asciime.patch')
-sha1sums=('SKIP'
- 'b07407c2be11cee7bd50e046024b89cf2579c448')
+source=("git://github.com/brndnmtthws/${_pkgname}.git")
+sha1sums=('SKIP')
options=('!strip' 'debug')
pkgver() {
@@ -50,7 +48,6 @@ pkgver() {
prepare() {
cd "${srcdir}/${_pkgname}"
- patch -p1 -i ../asciime.patch # db2x_manxml fails on non-ascii chars
mkdir -p build/ # as @afaikifreedom recommended
}
diff --git a/prepare4uploadpkg.sh b/prepare4uploadpkg.sh
index ac82dfe5b1e5..82f874f39bdc 100755
--- a/prepare4uploadpkg.sh
+++ b/prepare4uploadpkg.sh
@@ -2,7 +2,7 @@
makepkg --nobuild --skipinteg
-rm -rf src/ conky*
+rm -rf pkg/ src/ conky*
namcap PKGBUILD && makepkg --printsrcinfo > .SRCINFO || exit 1
git add . || exit 1 # PKGBUILD prepare4uploadpkg.sh .SRCINFO