[arch-commits] Commit in libjpeg/repos (extra-i686 extra-i686/PKGBUILD)

Allan McRae allan at archlinux.org
Fri Oct 17 22:36:20 EDT 2008


    Date: Friday, October 17, 2008 @ 22:36:19
  Author: allan
Revision: 15744

Fix conflict

Modified:
  libjpeg/repos/extra-i686/	(properties)
  libjpeg/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)


Property changes on: libjpeg/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /libjpeg/trunk:1
   + /libjpeg/trunk:1-15743

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-18 02:33:59 UTC (rev 15743)
+++ extra-i686/PKGBUILD	2008-10-18 02:36:19 UTC (rev 15744)
@@ -1,20 +1,24 @@
 # $Id$
-# Maintainer: dorphell <dorphell at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Committer: Judd Vinet <jvinet at zeroflux.org>
+
 pkgname=libjpeg
 pkgver=6b
-pkgrel=4
+pkgrel=5
 pkgdesc="Library of JPEG support functions"
+arch=('i686' 'x86_64')
+license=('custom')
 depends=('glibc')
+options=(!libtool)
 source=(ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v$pkgver.tar.gz)
 md5sums=('dbd5f3b47ed13132f04c685d608a7547')
 
 build() {
-  cd $startdir/src/jpeg-$pkgver
-  ./configure --prefix=/usr --enable-shared --enable-static
+  cd $srcdir/jpeg-$pkgver
+  ./configure --prefix=/usr --enable-shared --enable-static #--mandir=/usr/share/man
   make || return 1
-  mkdir -p $startdir/pkg/usr/{bin,lib,include,man/man1}
-  make prefix=$startdir/pkg/usr install
-
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  mkdir -p $pkgdir/usr/{bin,lib,include,share/man/man1}
+  make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man/man1 install
+  install -m644 jpegint.h $pkgdir/usr/include
+  install -Dm644 README $pkgdir/usr/share/licenses/libjpeg/README
 }




More information about the arch-commits mailing list