summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 90e93c2b18c7..bd52cd2e3ceb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = adwm-git
pkgdesc = Advanced dynamic window manager for X
pkgver = 0.7.16.r1.gfcfb1ff
- pkgrel = 1
+ pkgrel = 2
url = http://github.com/bbidulock/adwm
arch = i686
arch = x86_64
@@ -21,7 +21,7 @@ pkgbase = adwm-git
optdepends = xde-ctools-git: for xde-run, xde-winmenu, xde-winlist and xde-wkspmenu default bindings
optdepends = xde-menu-git: for xde-menu root menu default bindings
optdepends = xde-session-git: for xde-logout and xde-xlock default bindings
- provides = adwm=0.7.16-1
+ provides = adwm=0.7.16-2
conflicts = adwm
options = !libtool
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 2d42c1a1fded..d5a2ab6579ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=adwm-git
_pkgname=adwm
pkgver=0.7.16.r1.gfcfb1ff
-pkgrel=1
+pkgrel=2
pkgdesc="Advanced dynamic window manager for X"
arch=('i686' 'x86_64')
url="http://github.com/bbidulock/$_pkgname"
@@ -22,7 +22,7 @@ md5sums=('SKIP')
pkgver() {
cd $pkgname
- git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+ git describe --long --tags | sed -E 's,^[^0-9]*,,;s,([^-]*-g),r\1,;s,-,.,g'
}
prepare() {
@@ -34,7 +34,7 @@ build() {
cd $pkgname
./configure
# Fight unused direct deps
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+ sed -i -e "s| -shared | $LDFLAGS\0 |g" -e "s| if test \"\$export_dynamic\" = yes && test -n \"\$export_dynamic_flag_spec\"; then| func_append compile_command \" $LDFLAGS\"\n func_append finalize_command \" $LDFLAGS\"\n\0|" libtool
make
}