[arch-commits] Commit in flac/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Tuesday, August 9, 2011 @ 19:31:20
  Author: eric
Revision: 135033

upgpkg: flac 1.2.1-3
Put docs in split package, Fix license, Add check function, Remove ChangeLog

Modified:
  flac/trunk/PKGBUILD
Deleted:
  flac/trunk/ChangeLog

-----------+
 ChangeLog |    5 ----
 PKGBUILD  |   61 ++++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 37 insertions(+), 29 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-08-09 22:11:31 UTC (rev 135032)
+++ ChangeLog	2011-08-09 23:31:20 UTC (rev 135033)
@@ -1,5 +0,0 @@
-2009-08-01  Eric Belanger  <eric at archlinux.org>
-
-	* flac 1.2.1-2
-	* FHS man pages
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-09 22:11:31 UTC (rev 135032)
+++ PKGBUILD	2011-08-09 23:31:20 UTC (rev 135033)
@@ -1,38 +1,51 @@
 # $Id$
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
-pkgname=flac
+pkgbase=flac
+pkgname=('flac' 'flac-doc')
 pkgver=1.2.1
-pkgrel=2
-pkgdesc="Free Lossless Audio Codec"
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://flac.sourceforge.net/"
-license=('custom:Xiph' 'LGPL' 'GPL' 'FDL')
-depends=('glibc' 'libogg')
+license=('BSD' 'GPL')
+depends=('libogg')
 makedepends=('nasm' 'xmms')
 options=('!libtool' '!makeflags')
-source=(http://downloads.sf.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz 
+source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz 
 	flac-1.2.1-gcc-4.3-includes.patch)
-md5sums=('153c8b15a54da428d1f0fadc756c22c7' 
-	 'b9d245422bbc547b18a72897366bea77')
-sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' 
-	  '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560')
+md5sums=('153c8b15a54da428d1f0fadc756c22c7'
+         'b9d245422bbc547b18a72897366bea77')
+sha1sums=('bd54354900181b59db3089347cc84ad81e410b38'
+          '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	patch -Np1 -i ${srcdir}/flac-1.2.1-gcc-4.3-includes.patch || return 1
-	./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \
-	    --disable-sse --disable-rpath --with-pic || return 1
-	make || return 1
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch"
+  ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \
+    --disable-sse --disable-rpath --with-pic
+  make
 }
 
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install || return 1
+check() {
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make check
+}
 
-	# install license
-	install -Dm0644 COPYING.Xiph \
-	    ${pkgdir}/usr/share/licenses/${pkgname}/COPYING.Xiph || return 1
+package_flac() {
+  pkgdesc="Free Lossless Audio Codec"
+  optdepends=('xmms: for using the xmms plugin')
+  options=('!libtool' '!docs')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+package_flac-doc() {
+  pkgdesc="Developer documentation for the Free Lossless Audio Codec"
+  depends=('flac')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make DESTDIR="${pkgdir}" -C doc install
+  install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}