[arch-commits] Commit in archlinux-artwork/trunk (PKGBUILD archlinux-artwork.install)

[Pierre Schmitz]

    Date: Sunday, September 11, 2011 @ 16:55:49
  Author: pierre
Revision: 137825

upgpkg: archlinux-artwork 1.6-2

rebuild; minor cleanup

Modified:
  archlinux-artwork/trunk/PKGBUILD
Deleted:
  archlinux-artwork/trunk/archlinux-artwork.install

---------------------------+
 PKGBUILD                  |   13 +++++--------
 archlinux-artwork.install |    4 ----
 2 files changed, 5 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-11 20:50:48 UTC (rev 137824)
+++ PKGBUILD	2011-09-11 20:55:49 UTC (rev 137825)
@@ -1,21 +1,19 @@
 # $Id$
-# Maintainer: Thayer Williams <thayer at archlinux.org>
 # Contributor: Thayer Williams <thayer at archlinux.org>
 
 pkgname=archlinux-artwork
 pkgver=1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Official logos, icons, CD labels and other artwork for Arch Linux"
 arch=('any')
 url="http://www.archlinux.org/"
 license=('CCPL:cc-by-nc-sa' 'custom:TRADEMARKS')
-install=archlinux-artwork.install
-source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz)
+source=("ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz")
 md5sums=('85d812728309acaa6c9a07e41e3e7e65')
 
-build() {
+package() {
   cd $srcdir/$pkgname-$pkgver
-  mkdir -p $pkgdir/usr/share/archlinux/{docs,cd-labels,icons,logos,wmlogos,web}
+  install -d $pkgdir/usr/share/archlinux/{docs,cd-labels,icons,logos,wmlogos,web}
 
   install -m644 FONTS $pkgdir/usr/share/archlinux/docs/
   install -m644 TRADEMARKS $pkgdir/usr/share/archlinux/docs/
@@ -26,7 +24,6 @@
   install -m644 web/* $pkgdir/usr/share/archlinux/web/
 
   # add the custom license
-  mkdir -p $pkgdir/usr/share/licenses/$pkgname/
-  install -m644 TRADEMARKS $pkgdir/usr/share/licenses/$pkgname/
+  install -D -m644 TRADEMARKS $pkgdir/usr/share/licenses/$pkgname/TRADEMARKS
 }
 

Deleted: archlinux-artwork.install
===================================================================
--- archlinux-artwork.install	2011-09-11 20:50:48 UTC (rev 137824)
+++ archlinux-artwork.install	2011-09-11 20:55:49 UTC (rev 137825)
@@ -1,4 +0,0 @@
-post_install() {
-  echo "==> Artwork has been installed to /usr/share/archlinux"
-}
-