20181103-2: Put the fonts in /usr/share/fonts/

3 files changed, 105 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2d89d979d07..9697173b856f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,10 @@
-# Generated by mksrcinfo v8
-# Sat Nov  3 13:48:53 UTC 2018
 pkgbase = otf-gfs-majuscule
 	pkgdesc = Open Font Majuscule typefaces, provided by the Greek Font Society
 	pkgver = 20181103
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.greekfontsociety-gfs.gr/typefaces/majuscule
 	arch = any
-	license = custom:OTF
+	license = custom:SIL-OTF
 	depends = fontconfig
 	depends = xorg-font-utils
 	noextract = GFS_Ignacio.zip
@@ -16,6 +14,7 @@ pkgbase = otf-gfs-majuscule
 	noextract = GFS_Eustace.zip
 	noextract = GFS_Fleischman.zip
 	noextract = GFS_Ambrosia.zip
+	noextract = LICENSE
 	source = http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Ignacio.zip
 	source = http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Garaldus.zip
 	source = http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Jackson.zip
@@ -23,6 +22,7 @@ pkgbase = otf-gfs-majuscule
 	source = http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Eustace.zip
 	source = http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Fleischman.zip
 	source = http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Ambrosia.zip
+	source = LICENSE
 	md5sums = ec397b1199ca79404adec355eeb5c163
 	md5sums = 7638996769c9162f0d8b8885c18af68f
 	md5sums = 73d235051292e23bc807c71d8c951e6b
@@ -30,6 +30,7 @@ pkgbase = otf-gfs-majuscule
 	md5sums = b54eea11af83c569b861a17800fb1945
 	md5sums = adcb048bdca18dd243c0337bdb0c5ecd
 	md5sums = 891a6e880ca0ef06223eedfab7c0e035
+	md5sums = 288069c8fb0c828b081833cfcfe0638b
 
 pkgname = otf-gfs-majuscule
 
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..77b17316cf1e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,91 @@
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/PKGBUILD b/PKGBUILD
index d55e5dd9e020..fac5aee5b21a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 
 pkgname=otf-gfs-majuscule
 pkgver=20181103
-pkgrel=1
+pkgrel=2
 pkgdesc='Open Font Majuscule typefaces, provided by the Greek Font Society'
 arch=(any)
 url='http://www.greekfontsociety-gfs.gr/typefaces/majuscule'
-license=('custom:OTF')
+license=('custom:SIL-OTF')
 depends=('fontconfig' 'xorg-font-utils')
 source=("http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Ignacio.zip"
 	"http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Garaldus.zip"
@@ -15,7 +15,8 @@ source=("http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Ignacio.zip"
 	"http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Nicefore.zip"
 	"http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Eustace.zip"
 	"http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Fleischman.zip"
-	"http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Ambrosia.zip")
+	"http://www.greekfontsociety-gfs.gr/_assets/fonts/GFS_Ambrosia.zip"
+	"LICENSE")
 
 md5sums=('ec397b1199ca79404adec355eeb5c163'
          '7638996769c9162f0d8b8885c18af68f'
@@ -23,7 +24,8 @@ md5sums=('ec397b1199ca79404adec355eeb5c163'
          '02fcaf05448bb0df6696567975014132'
          'b54eea11af83c569b861a17800fb1945'
          'adcb048bdca18dd243c0337bdb0c5ecd'
-         '891a6e880ca0ef06223eedfab7c0e035')
+         '891a6e880ca0ef06223eedfab7c0e035'
+         '288069c8fb0c828b081833cfcfe0638b')
 
 noextract=(${source[@]##*/})
 
@@ -39,10 +41,9 @@ unzip GFS_Eustace.zip
 unzip GFS_Fleischman.zip
 unzip GFS_Ambrosia.zip
 
-install -d $pkgdir/usr/share/fonts/OTF/
-install -Dm644 $srcdir/GFS*/*otf $pkgdir/usr/share/fonts/OTF/
+install -d $pkgdir/usr/share/fonts/$pkgname/
+install -Dm644 $srcdir/GFS*/*otf $pkgdir/usr/share/fonts/$pkgname/
 install -d $pkgdir/usr/share/licenses/$pkgname/
+install -Dm644 $srcdir/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
 }
-
-