summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoraksr2015-09-30 22:08:49 +0200
committeraksr2015-09-30 22:08:49 +0200
commite458840ddb928a5b63738c9231679b2f508a2050 (patch)
tree5957a6ca9fb7762090aa079cc0dc38e94e02fc7d
parent139dcd8aaf5e456c8bfcb985d940dd4e3d9a8ac0 (diff)
downloadaur-e458840ddb928a5b63738c9231679b2f508a2050.tar.gz
/usr/local => /usr
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD17
2 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2ae2b22255d..c3c57cf6666 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = wmutils-git
pkgdesc = A set of tools for X windows manipulation.
- pkgver = 1.0.r25.g7b86e8b
+ pkgver = 1.1.r0.g7b86e8b
pkgrel = 1
url = https://github.com/wmutils/core
arch = i686
arch = x86_64
license = ISC
depends = libxcb
+ conflicts = wmutils
source = wmutils-git::git+https://github.com/wmutils/core.git
source = git+https://github.com/wmutils/opt.git
source = git+https://github.com/wmutils/contrib.git
diff --git a/PKGBUILD b/PKGBUILD
index 71ae1e9cfd6..4305d28a73d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
# Contributor: Alad <alad@archlinux.info>
# Maintainer: aksr <aksr at t-com dot me>
pkgname=wmutils-git
-pkgver=1.0.r25.g7b86e8b
+pkgver=1.1.r0.g7b86e8b
pkgrel=1
pkgdesc="A set of tools for X windows manipulation."
url="https://github.com/wmutils/core"
arch=('i686' 'x86_64')
license=('ISC')
depends=('libxcb')
+conflicts=('wmutils')
source=("$pkgname::git+https://github.com/wmutils/core.git"
'git+https://github.com/wmutils/opt.git'
'git+https://github.com/wmutils/contrib.git')
@@ -19,23 +20,23 @@ pkgver() {
git describe --long --tags | sed -r 's/^v//g;s/([^-]*-g)/r\1/;s/-/./g'
}
build() {
- cd "$srcdir/$pkgname"; make
- cd "$srcdir/opt"; make
- cd "$srcdir/contrib/killwa"; make
+ cd "$srcdir/$pkgname"
+ make
+ cd "$srcdir/opt"
+ make
+ cd "$srcdir/contrib/killwa"
+ make
}
package() {
- prefix="/usr/local"
+ prefix="/usr"
manprefix="$prefix/share/man"
licenseprefix="/usr"
-
cd "$srcdir/$pkgname"
make DESTDIR="$pkgdir" PREFIX="$prefix" MANPREFIX="$manprefix" install
install -Dm644 LICENSE $pkgdir/$licenseprefix/share/licenses/$pkgname/LICENSE
-
cd "$srcdir/opt"
make DESTDIR="$pkgdir" PREFIX="$prefix" MANPREFIX="$manprefix" install
-
mkdir -p "$pkgdir/$prefix/share/doc/wmutils/examples"
install -Dm644 ../contrib/*.sh $pkgdir/$prefix/share/doc/wmutils/examples
install -m755 ../contrib/killwa/killwa $pkgdir/$prefix/bin/killwa