[arch-commits] Commit in ttf-fireflysung/repos (3 files)

[Eric Bélanger]

    Date: Sunday, May 3, 2009 @ 20:13:17
  Author: eric
Revision: 37838

Merged revisions 37837 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/ttf-fireflysung/trunk

........
  r37837 | eric | 2009-05-03 20:13:00 -0400 (Sun, 03 May 2009) | 2 lines
  
  upgpkg: ttf-fireflysung 1.4.2-2
      Added license, Fixed install scriptlet
........

Modified:
  ttf-fireflysung/repos/extra-x86_64/	(properties)
  ttf-fireflysung/repos/extra-x86_64/PKGBUILD
  ttf-fireflysung/repos/extra-x86_64/ttf.install

-------------+
 PKGBUILD    |   12 +++++++-----
 ttf.install |    9 ++-------
 2 files changed, 9 insertions(+), 12 deletions(-)


Property changes on: ttf-fireflysung/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /ttf-fireflysung/trunk:1-8961
   + /ttf-fireflysung/trunk:1-37837

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-04 00:13:00 UTC (rev 37837)
+++ extra-x86_64/PKGBUILD	2009-05-04 00:13:17 UTC (rev 37838)
@@ -3,10 +3,11 @@
 
 pkgname=ttf-fireflysung
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="firefly embedded (truetype) bitmap font"
 arch=("i686" "x86_64")
 url="http://www.study-area.org/apt/firefly-font/"
+license=('custom: Arphic Public_License')
 depends=(fontconfig xorg-font-utils)
 install=ttf.install
 #source=(${url}/fireflysung-${pkgver}.tar.gz)
@@ -14,8 +15,9 @@
 md5sums=('d60a23d5056f2303ae6fde469e6915b8')
 
 build() {
-  cd ${startdir}/src/opendesktop-fonts-${pkgver}
-  mkdir -p  ${startdir}/pkg/usr/share/fonts/TTF
-  install -m 644 *.ttf ${startdir}/pkg/usr/share/fonts/TTF
-  install -m 644 *.ttc ${startdir}/pkg/usr/share/fonts/TTF
+  cd ${srcdir}/opendesktop-fonts-${pkgver}
+  install -d ${pkgdir}/usr/share/fonts/TTF
+  install -m 644 *.ttf ${pkgdir}/usr/share/fonts/TTF
+  install -m 644 *.ttc ${pkgdir}/usr/share/fonts/TTF
+  install -D -m644 COPYRIGHT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

Modified: extra-x86_64/ttf.install
===================================================================
--- extra-x86_64/ttf.install	2009-05-04 00:13:00 UTC (rev 37837)
+++ extra-x86_64/ttf.install	2009-05-04 00:13:17 UTC (rev 37838)
@@ -1,8 +1,8 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
   echo "done."
 }
 
@@ -13,8 +13,3 @@
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*