[arch-commits] Commit in libxinerama/trunk (LICENSE PKGBUILD)

[Jan de Groot]

    Date: Monday, November 1, 2010 @ 18:26:22
  Author: jgc
Revision: 97812

upgpkg: libxinerama 1.1.1-1
Update to 1.1.1

Modified:
  libxinerama/trunk/PKGBUILD
Deleted:
  libxinerama/trunk/LICENSE

----------+
 LICENSE  |   24 ------------------------
 PKGBUILD |   20 +++++++++-----------
 2 files changed, 9 insertions(+), 35 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2010-11-01 22:24:10 UTC (rev 97811)
+++ LICENSE	2010-11-01 22:26:22 UTC (rev 97812)
@@ -1,24 +0,0 @@
-/*****************************************************************
-Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-******************************************************************/

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-01 22:24:10 UTC (rev 97811)
+++ PKGBUILD	2010-11-01 22:26:22 UTC (rev 97812)
@@ -2,25 +2,23 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=libxinerama
-pkgver=1.1
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="X11 Xinerama extension library"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libxext>=1.1' 'xineramaproto>=1.2')
-makedepends=('pkgconfig')
+depends=('libxext' 'xineramaproto')
+makedepends=('xorg-util-macros')
 options=(!libtool)
-source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2
-        LICENSE)
-md5sums=('a2ac01fc0426cdbb713c5d59cf9955ed'
-         '098e0bc089368a988092b3cbda617a57')
+source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2)
+sha1sums=('f030b0cfcce15502aac78188524f32a6f29bd0a4')
 
 build() {
   cd "${srcdir}/libXinerama-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }