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

[Jan de Groot]

    Date: Wednesday, December 22, 2010 @ 09:40:16
  Author: jgc
Revision: 103685

upgpkg: xbitmaps 1.1.1-1
Update to 1.1.1, remove our own license file, use upstream included file

Modified:
  xbitmaps/trunk/PKGBUILD
Deleted:
  xbitmaps/trunk/LICENSE

----------+
 LICENSE  |   49 -------------------------------------------------
 PKGBUILD |   22 +++++++++++-----------
 2 files changed, 11 insertions(+), 60 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2010-12-22 14:30:22 UTC (rev 103684)
+++ LICENSE	2010-12-22 14:40:16 UTC (rev 103685)
@@ -1,49 +0,0 @@
-Copyright 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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 THE OPEN GROUP BE LIABLE FOR ANY CLAIM, 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 The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
-/*****************************************************************************/
-/**       Copyright 1988 by Evans & Sutherland Computer Corporation,        **/
-/**                          Salt Lake City, Utah                           **/
-/**                                                                         **/
-/**                           All Rights Reserved                           **/
-/**                                                                         **/
-/**    Permission to use, copy, modify, and distribute this software and    **/
-/**    its documentation  for  any  purpose  and  without  fee is hereby    **/
-/**    granted, provided that the above copyright notice appear  in  all    **/
-/**    copies and that both  that  copyright  notice  and  this  permis-    **/
-/**    sion  notice appear in supporting  documentation,  and  that  the    **/
-/**    name  of Evans & Sutherland  not be used in advertising or publi-    **/
-/**    city pertaining to distribution  of the software without  specif-    **/
-/**    ic, written prior permission.                                        **/
-/**                                                                         **/
-/**    EVANS  & SUTHERLAND  DISCLAIMS  ALL  WARRANTIES  WITH  REGARD  TO    **/
-/**    THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILI-    **/
-/**    TY AND FITNESS, IN NO EVENT SHALL EVANS &  SUTHERLAND  BE  LIABLE    **/
-/**    FOR  ANY  SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY  DAM-    **/
-/**    AGES  WHATSOEVER RESULTING FROM  LOSS OF USE,  DATA  OR  PROFITS,    **/
-/**    WHETHER   IN  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS    **/
-/**    ACTION, ARISING OUT OF OR IN  CONNECTION  WITH  THE  USE  OR PER-    **/
-/**    FORMANCE OF THIS SOFTWARE.                                           **/
-/*****************************************************************************/

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-22 14:30:22 UTC (rev 103684)
+++ PKGBUILD	2010-12-22 14:40:16 UTC (rev 103685)
@@ -1,22 +1,22 @@
 # $Id$
-#Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xbitmaps
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="X.org Bitmap files"
 arch=('any')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-makedepends=('pkgconfig')
-source=(${url}/releases/individual/data/${pkgname}-${pkgver}.tar.bz2 LICENSE)
-md5sums=('f9ddd4e70a5375508b3acaf17be0d0ab'
-         '546bd110a7759da7ca26c07a6e29b642')
+makedepends=('xorg-util-macros')
+source=(${url}/releases/individual/data/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('578afff7e4912192b524c25254cf7f54c16e57d8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }