summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
-rw-r--r--ttf-merriweather.install15
3 files changed, 1 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ee07ce31b35..af6477c2674 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
# Generated by mksrcinfo v8
-# Mon Feb 6 21:09:31 UTC 2017
+# Tue Feb 14 00:14:10 UTC 2017
pkgbase = ttf-merriweather
pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co
pkgver = 2.001
pkgrel = 1
url = https://fonts.google.com/specimen/Merriweather
- install = ttf-merriweather.install
arch = any
license = custom:SIL Open Font License v1.1
depends = fontconfig
diff --git a/PKGBUILD b/PKGBUILD
index c658d84532b..aac11ba8f76 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,6 @@ url='https://fonts.google.com/specimen/Merriweather'
license=('custom:SIL Open Font License v1.1')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git' 'ttf-merriweather-ib')
-install="${pkgname}.install"
source=("Merriweather-Black-${pkgver}.ttf::https://github.com/google/fonts/raw/4f421f4cdb58fc933453ef5ae163f8310761cdc4/ofl/merriweather/Merriweather-Black.ttf"
"Merriweather-BlackItalic-${pkgver}.ttf::https://github.com/google/fonts/raw/4f421f4cdb58fc933453ef5ae163f8310761cdc4/ofl/merriweather/Merriweather-BlackItalic.ttf"
"Merriweather-Bold-${pkgver}.ttf::https://github.com/google/fonts/raw/4f421f4cdb58fc933453ef5ae163f8310761cdc4/ofl/merriweather/Merriweather-Bold.ttf"
diff --git a/ttf-merriweather.install b/ttf-merriweather.install
deleted file mode 100644
index 43e14fbd0cf..00000000000
--- a/ttf-merriweather.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo -n "Updating font cache... "
- fc-cache -f > /dev/null
- mkfontscale /usr/share/fonts/TTF
- mkfontdir /usr/share/fonts/TTF
- echo "done."
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}