[arch-commits] Commit in ttf-oxygen/trunk (PKGBUILD ttf-oxygen.install)

[Andrea Scarpino]

    Date: Saturday, January 3, 2015 @ 09:42:04
  Author: andrea
Revision: 228372

upgpkg: ttf-oxygen 1:5.1.2-2

Use fc-cache -s to speed up installation and fix install dir

Modified:
  ttf-oxygen/trunk/PKGBUILD
  ttf-oxygen/trunk/ttf-oxygen.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-03 07:10:59 UTC (rev 228371)
+++ PKGBUILD	2015-01-03 08:42:04 UTC (rev 228372)
@@ -5,7 +5,7 @@
 pkgname=ttf-oxygen
 epoch=1
 pkgver=5.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='The Oxygen font family. A desktop/gui font family for integrated use with the KDE desktop'
 url='https://projects.kde.org/projects/kde/workspace/oxygen-fonts'
 arch=('any')
@@ -26,7 +26,8 @@
   cmake ../oxygen-fonts-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DLIB_INSTALL_DIR=lib
+    -DLIB_INSTALL_DIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
   make
 }
 
@@ -34,6 +35,11 @@
   cd build
   make DESTDIR="${pkgdir}" install
 
+  # Fix install path
+  install -d "${pkgdir}"/usr/share/fonts/TTF
+  mv "${pkgdir}"/usr/share/fonts/truetype/oxygen/*.ttf \
+    "${pkgdir}"/usr/share/fonts/TTF/
+
   install -d "${pkgdir}"/usr/share/licenses/${pkgname}
   install -m644 "${srcdir}"/oxygen-fonts-${pkgver}/COPYING-{GPL+FE.txt,OFL} \
     "${pkgdir}"/usr/share/licenses/${pkgname}

Modified: ttf-oxygen.install
===================================================================
--- ttf-oxygen.install	2015-01-03 07:10:59 UTC (rev 228371)
+++ ttf-oxygen.install	2015-01-03 08:42:04 UTC (rev 228372)
@@ -1,6 +1,6 @@
 post_install() {
   echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
+  fc-cache -s
   mkfontscale /usr/share/fonts/truetype/oxygen
   mkfontdir /usr/share/fonts/truetype/oxygen
   echo "done."