[arch-commits] Commit in xorg-fonts-cyrillic/repos (3 files)

[Eric Bélanger]

    Date: Thursday, April 23, 2009 @ 19:08:00
  Author: eric
Revision: 36496

Merged revisions 356,36495 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xorg-fonts-cyrillic/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r36495 | eric | 2009-04-23 19:07:44 -0400 (Thu, 23 Apr 2009) | 2 lines
  
  upgpkg: xorg-fonts-cyrillic 1.0.0-4
      Updated font-screen-cyrillic, Added license
........

Modified:
  xorg-fonts-cyrillic/repos/extra-x86_64/	(properties)
  xorg-fonts-cyrillic/repos/extra-x86_64/PKGBUILD
  xorg-fonts-cyrillic/repos/extra-x86_64/xfonts.install

----------------+
 PKGBUILD       |   18 ++++++++++--------
 xfonts.install |    5 -----
 2 files changed, 10 insertions(+), 13 deletions(-)


Property changes on: xorg-fonts-cyrillic/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-fonts-cyrillic/trunk:1
   + /xorg-fonts-cyrillic/trunk:1-36495

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-23 23:07:44 UTC (rev 36495)
+++ extra-x86_64/PKGBUILD	2009-04-23 23:08:00 UTC (rev 36496)
@@ -3,31 +3,33 @@
 
 pkgname=xorg-fonts-cyrillic
 pkgver=1.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org cyrillic fonts"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
 install=xfonts.install
 source=(${url}/releases/individual/font/font-cronyx-cyrillic-${pkgver}.tar.bz2
         ${url}/releases/individual/font/font-misc-cyrillic-${pkgver}.tar.bz2
-        ${url}/releases/individual/font/font-screen-cyrillic-${pkgver}.tar.bz2
+        ${url}/releases/individual/font/font-screen-cyrillic-1.0.1.tar.bz2
         ${url}/releases/individual/font/font-winitzki-cyrillic-${pkgver}.tar.bz2)
-md5sums=(22b451e7230b8c003cfc496ee2d360cc 3596907d7a2a99c81d8de99bc4552b6a
-         aea02d9dff03e0e1a3de85364367c0c6 b99b02aff36a88ca3379715423c60303)
+md5sums=('22b451e7230b8c003cfc496ee2d360cc' '3596907d7a2a99c81d8de99bc4552b6a'\
+         'c8d5aef01c906c7aaea329702a8b1b63' 'b99b02aff36a88ca3379715423c60303')
 
 build() {
-  cd ${startdir}/src
-  for dir in font-*-cyrillic-${pkgver}; do
+  cd ${srcdir}
+  for dir in font-*-cyrillic-${pkgver} font-*-cyrillic-1.0.1; do
     pushd ${dir}
       ./configure --prefix=/usr \
                   --with-mapfiles=/usr/share/fonts/util \
 		  --with-fontdir=/usr/share/fonts/cyrillic
       make || return 1
-      make DESTDIR=${startdir}/pkg install || return 1
+      make DESTDIR=${pkgdir} install || return 1
+ install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.${dir%-*}
     popd
   done
-  rm -f ${startdir}/pkg/usr/share/fonts/*/fonts.*
+  rm -f ${pkgdir}/usr/share/fonts/*/fonts.*
     
 }
 

Modified: extra-x86_64/xfonts.install
===================================================================
--- extra-x86_64/xfonts.install	2009-04-23 23:07:44 UTC (rev 36495)
+++ extra-x86_64/xfonts.install	2009-04-23 23:08:00 UTC (rev 36496)
@@ -13,8 +13,3 @@
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*