.., fix build...

2 files changed, 29 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8cc69851f717..12984d0509d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = foo-wm-git
 	pkgdesc = A minimal window manager that organizes windows in a tree data structure, provides a socket to send commands to.
-	pkgver = 0.r272.a9df24b
-	pkgrel = 3
+	pkgver = r272.a9df24b
+	pkgrel = 1
 	url = https://github.com/mil/foo-wm
 	arch = i686
 	arch = x86_64
-	license = custom
+	license = custom:MIT
 	makedepends = git
 	conflicts = foo-wm
-	source = foo-wm-git::git+https://github.com/mil/foo-wm.git
+	source = foo-wm-git::git+https://github.com/mil/foo-wm
 	md5sums = SKIP
 
 pkgname = foo-wm-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 33c89e0263e4..50db04194b9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,40 @@
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=foo-wm-git
-pkgver=0.r272.a9df24b
-pkgrel=3
-epoch=
-pkgdesc="A minimal window manager that organizes windows in a tree data structure, provides a socket to send commands to."
+pkgver=r272.a9df24b
+pkgrel=1
+pkgdesc='A minimal window manager that organizes windows in a tree data structure, provides a socket to send commands to.'
 arch=('i686' 'x86_64')
 url="https://github.com/mil/foo-wm"
-license=('custom')
-groups=()
-depends=('')
+license=('custom:MIT')
 makedepends=('git')
-optdepends=()
-checkdepends=()
-provides=()
-conflicts=('foo-wm')
-replaces=()
-backup=()
-options=()
-changelog=
-install=
-source=("$pkgname::git+https://github.com/mil/foo-wm.git")
-noextract=()
+conflicts=("${pkgname%-*}")
+source=("$pkgname::git+$url")
 md5sums=('SKIP')
 
+prepare() {
+	cd "$srcdir/$pkgname"
+	sed -i 's/CC=gcc/& -fcommon/' Makefile
+}
+
 pkgver() {
-  cd "$srcdir/$pkgname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "$srcdir/$pkgname"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "$srcdir/$pkgname"
-  make
+	cd "$srcdir/$pkgname"
+	make
 }
 
 package() {
-  cd "$srcdir/$pkgname"
-  install -Dm755 foo-wm $pkgdir/usr/bin/foo-wm
-  install -Dm755 foo-wm-c $pkgdir/usr/bin/foo-wm-c
-  install -Dm755 config/writefifo $pkgdir/usr/share/doc/$_pkgname/config/writefifo
-  install -Dm644 config/commands $pkgdir/usr/share/doc/$_pkgname/config/commands
-  install -Dm644 scripts/client.rb $pkgdir/usr/share/doc/$_pkgname/scripts/client.rb
-  install -Dm644 scripts/marks.rb $pkgdir/usr/share/doc/$_pkgname/scripts/marks.rb
-  install -Dm644 scripts/uncontainerize.rb $pkgdir/usr/share/doc/$_pkgname/scripts/uncontainerize.rb
-  install -Dm644 README.md $pkgdir/usr/share/doc/$_pkgname/README.md
-  install -Dm644 TODO.md $pkgdir/usr/share/doc/$_pkgname/TODO.md
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+	cd "$srcdir/$pkgname"
+	install -Dm755 foo-wm $pkgdir/usr/bin/foo-wm
+	install -Dm755 foo-wm-c $pkgdir/usr/bin/foo-wm-c
+	install -Dm755 config/writefifo $pkgdir/usr/share/doc/$_pkgname/config/writefifo
+	install -Dm644 config/commands $pkgdir/usr/share/doc/$_pkgname/config/commands
+	install -Dm644 scripts/client.rb $pkgdir/usr/share/doc/$_pkgname/scripts/client.rb
+	install -Dm644 scripts/marks.rb $pkgdir/usr/share/doc/$_pkgname/scripts/marks.rb
+	install -Dm644 scripts/uncontainerize.rb $pkgdir/usr/share/doc/$_pkgname/scripts/uncontainerize.rb
+	install -Dm644 README.md $pkgdir/usr/share/doc/$_pkgname/README.md
+	install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
-