version 5.5.0.rc8.14-1

2 files changed, 30 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7753be4285e..c4de680c48ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,23 @@
 pkgbase = vtwm-git
 	pkgdesc = A lightweight, customizable window manager with a virtual desktop
-	pkgver = 5.5.0.rc8.15
-	pkgrel = 5
+	pkgver = 5.5.0.rc8.14
+	pkgrel = 1
 	url = http://www.vtwm.org
 	arch = i686
 	arch = x86_64
-	license = MIT
+	license = custom
 	makedepends = git
 	depends = libxpm
 	depends = libxmu
 	depends = libxft
 	depends = libxinerama
 	depends = libxrandr
-	depends = esound
-	depends = rplay
 	optdepends = m4: for config file preprocessing
 	provides = vtwm
 	conflicts = vtwm
 	options = !makeflags
 	backup = usr/share/X11/vtwm/system.vtwmrc
-	source = vtwm-git::git://git.code.sf.net/p/vtwm/code
+	source = git://git.code.sf.net/p/vtwm/code
 	source = vtwm.desktop
 	md5sums = SKIP
 	md5sums = 7b4fcabdd4cf2b3a03683c37cb0fa82b
diff --git a/PKGBUILD b/PKGBUILD
index 60b3f6029cf1..9ef6cc802a18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,59 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 pkgname=vtwm-git
-pkgver=5.5.0.rc8.15
-pkgrel=5
+_pkgname=vtwm
+pkgver=5.5.0.rc8.14
+pkgrel=1
 pkgdesc="A lightweight, customizable window manager with a virtual desktop"
 arch=('i686' 'x86_64')
 url="http://www.vtwm.org"
-license=('MIT')
-provides=('vtwm')
-conflicts=('vtwm')
-depends=('libxpm' 'libxmu' 'libxft' 'libxinerama' 'libxrandr' 'esound' 'rplay')
+license=('custom')
+provides=($_pkgname)
+conflicts=($_pkgname)
+depends=('libxpm' 'libxmu' 'libxft' 'libxinerama' 'libxrandr')
 optdepends=('m4: for config file preprocessing')
 makedepends=('git')
 backup=('usr/share/X11/vtwm/system.vtwmrc')
 options=('!makeflags')
-source=("$pkgname::git://git.code.sf.net/p/vtwm/code"
+source=("git://git.code.sf.net/p/vtwm/code"
 	"vtwm.desktop")
 md5sums=('SKIP'
          '7b4fcabdd4cf2b3a03683c37cb0fa82b')
 
+_gitname='code'
+
 pkgver() {
-  cd $pkgname
-  git describe --tags --always | sed 's,^[^0-9]*,,;s,-,.,g;s,\.g[a-f0-9]*$,,'
+  cd $_gitname
+  git describe --always | sed 's|-|.|g;s|[.]g[a-f0-9]*$||'
 }
 
 prepare() {
-  cd $pkgname
+  cd $_gitname
   sed -e "/^AC_INIT/s|^.*$|AC_INIT([vtwm],[$pkgver], [mailto:vtwm-hackers@lists.sandelman.ca],[vtwm])|" \
     -i configure.ac
-  (
-	  head -n 26 add_window.c
-	  head -n 20 applets.c
-	  head -n 18 desktop.c
-	  head -n 22 sound.c
-	  cat contrib/nexpm/xpm.COPYRIGHT
-
-  ) >COPYRIGHT
 }
 
 build() {
-  cd $pkgname
+  cd $_gitname
   aclocal
   automake --foreign --add-missing
   autoconf
   ./configure --prefix=/usr --sysconfdir=/etc
   make V=0
+  head -n 26 add_window.c > EH_MIT
+  head -n 20 applets.c > MIT
+  head -n 18 desktop.c > DE_ICSTM
+  head -n 24 gram.c > Bison_GPL
+  head -n 22 sound.c > DJHJ
 }
 
 package() {
-  cd $pkgname
+  cd $_gitname
   make DESTDIR="$pkgdir" install
-  install -Dm0644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+  install -Dm0644 EH_MIT    "$pkgdir/usr/share/licenses/$pkgname/EH_MIT"
+  install -Dm0644 MIT	    "$pkgdir/usr/share/licenses/$pkgname/MIT"
+  install -Dm0644 DE_ICSTM  "$pkgdir/usr/share/licenses/$pkgname/DE_ICSTM"
+  install -Dm0644 Bison_GPL "$pkgdir/usr/share/licenses/$pkgname/Bison_GPL"
+  install -Dm0644 DJHJ	    "$pkgdir/usr/share/licenses/$pkgname/DJHJ"
+  install -Dm0644 contrib/nexpm/xpm.COPYRIGHT    "$pkgdir/usr/share/licenses/$pkgname/xpm.COPYRIGHT"
   install -Dm0644 ../vtwm.desktop "$pkgdir/usr/share/xsessions/vtwm.desktop"
 }