From 3132dc60a08235104ac5a4244a8f6fdb2449964b Mon Sep 17 00:00:00 2001
From: Robert-André Mauchin <zebob.m@gmail.com>
Date: Jun 05 2018 21:40:50 +0000
Subject: Upstream release 2.012


---

diff --git a/.gitignore b/.gitignore
index a43f5fd..5e9ceb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Inconsolata.sfd
+/levien-inconsolata-fonts-2.012.tar.gz
diff --git a/levien-inconsolata-fonts-fontconfig.conf b/levien-inconsolata-fonts-fontconfig.conf
index c0fb37e..a3fdbbe 100644
--- a/levien-inconsolata-fonts-fontconfig.conf
+++ b/levien-inconsolata-fonts-fontconfig.conf
@@ -4,14 +4,42 @@
   <alias>
     <family>monospace</family>
     <prefer>
-      <family>Inconsolata</family>
+      <family>Inconsolata Regular</family>
     </prefer>
   </alias>
   <alias>
-    <family>Inconsolata</family>
+    <family>Inconsolata Regular</family>
     <default>
       <family>monospace</family>
     </default>
   </alias>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Inconsolata Bold</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Inconsolata Bold</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+  <match target="font">
+    <test name="family" compare="eq">
+      <string>Inconsolata Regular</string>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>true</bool>
+    </edit>
+  </match>
+  <match target="font">
+    <test name="family" compare="eq">
+      <string>Inconsolata Bold</string>
+    </test>
+    <edit name="autohint" mode="assign">
+      <bool>true</bool>
+    </edit>
+  </match>
 </fontconfig>
 
diff --git a/levien-inconsolata-fonts.spec b/levien-inconsolata-fonts.spec
index dbab22e..c989d1b 100644
--- a/levien-inconsolata-fonts.spec
+++ b/levien-inconsolata-fonts.spec
@@ -2,13 +2,13 @@
 %global fontconf 75-%{fontname}.conf
 
 Name:           %{fontname}-fonts
-Version:        1.01
-Release:        16%{?dist}
+Version:        2.012
+Release:        1%{?dist}
 Summary:        Inconsolata fonts
 
 License:        OFL
 URL:            http://www.levien.com/type/myfonts/inconsolata.html
-Source0:        http://www.levien.com/type/myfonts/Inconsolata.sfd
+Source0:        https://github.com/googlefonts/Inconsolata/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}-fontconfig.conf
 Source2:        %{fontname}.metainfo.xml
 
@@ -17,29 +17,17 @@ BuildRequires:  fontpackages-devel
 BuildRequires:  fontforge
 Requires:       fontpackages-filesystem
 
-Obsoletes: inconsolata-fonts < 1.009-3
-
 %description
 A monospace font, designed for code listings and the like, in print.
 
+
 %prep
+%autosetup -n Inconsolata-%{version}
 
-%build
-fontforge -lang=ff -script "-" %{SOURCE0} <<_EOF
-i = 1
-while ( i < \$argc )
-  Open (\$argv[i], 1)
-  Generate (\$fontname + ".ttf")
-  PrintSetup (5)
-  PrintFont (0, 0, "", \$fontname + "-sample.pdf")
-  Close()
-  i++
-endloop
-_EOF
 
 %install
 install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p fonts/ttf/*.ttf %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
@@ -51,13 +39,18 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 
 # Add AppStream metadata
 install -Dm 0644 -p %{SOURCE2} \
-        %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
+        %{buildroot}%{_datadir}/metainfo/%{fontname}.metainfo.xml
 
+        
 %_font_pkg -f %{fontconf} *.ttf
-%doc *.pdf
-%{_datadir}/appdata/%{fontname}.metainfo.xml
+%doc documentation/*.pdf
+%{_datadir}/metainfo/%{fontname}.metainfo.xml
+
 
 %changelog
+* Tue Jun 05 2018 Robert-André Mauchin <zebob.m@gmail.com> - 2.012-1
+- Upstream release 2.012
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.01-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/levien-inconsolata.metainfo.xml b/levien-inconsolata.metainfo.xml
index 288505e..630a341 100644
--- a/levien-inconsolata.metainfo.xml
+++ b/levien-inconsolata.metainfo.xml
@@ -3,6 +3,7 @@
 <component type="font">
   <id>levien-inconsolata</id>
   <metadata_license>CC-BY-3.0</metadata_license>
+  <project_license>OFL</project_license>
   <name>Inconsolata</name>
   <summary>Inconsolata fonts</summary>
   <description>
diff --git a/sources b/sources
index 246337d..ffc46c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d74e17f15990e5b24ba697f236cc9a98  Inconsolata.sfd
+SHA512 (levien-inconsolata-fonts-2.012.tar.gz) = 9feb6a5e9fcee27de5ec38ed328f4731ddad10ff7030c598bf466b01e71b84ff670b1e998a99ffc6234003bee87a6ef6b2c02c446387f2b7594f4f90d2bc41fe