tomh pushed to kosmtik (f21). "Update for mozilla-fira-sans 3.111"

[notifications at fedoraproject.org]

>From 448fbd917ca346eed52e384ceb0e07cb383e1e09 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom at compton.nu>
Date: Tue, 9 Dec 2014 13:01:08 +0000
Subject: Update for mozilla-fira-sans 3.111


diff --git a/kosmtik-fonts.patch b/kosmtik-fonts.patch
index 4bc7e3e..8b42030 100644
--- a/kosmtik-fonts.patch
+++ b/kosmtik-fonts.patch
@@ -1,4 +1,4 @@
-commit 6b41cbacd710e5c5713e694fa89b409295cb4e40
+commit 62c948ae626e5d234564a9de06f38a70b8f5d950
 Author: Tom Hughes <tom at compton.nu>
 Date:   Mon Dec 8 10:12:15 2014 +0000
 
@@ -17,7 +17,7 @@ index c25824f..7a6b2cb 100644
      };
  
 diff --git a/src/front/Core.css b/src/front/Core.css
-index f3e6bc6..843954c 100644
+index f3e6bc6..60adbb9 100644
 --- a/src/front/Core.css
 +++ b/src/front/Core.css
 @@ -5,10 +5,7 @@
@@ -28,7 +28,7 @@ index f3e6bc6..843954c 100644
 -    src: url('./fonts/FiraSans-Bold.eot?#iefix') format('embedded-opentype'),
 -         url('./fonts/FiraSans-Bold.woff') format('woff'),
 -         url('./fonts/FiraSans-Bold.ttf') format('truetype');
-+    src: url('./fonts/FiraSansOT-Bold.otf');
++    src: url('./fonts/FiraSans-Bold.otf');
      font-weight: normal;
      font-style: normal;
  
@@ -40,7 +40,7 @@ index f3e6bc6..843954c 100644
 -    src: url('./fonts/FiraSans-Regular.eot?#iefix') format('embedded-opentype'),
 -         url('./fonts/FiraSans-Regular.woff') format('woff'),
 -         url('./fonts/FiraSans-Regular.ttf') format('truetype');
-+    src: url('./fonts/FiraSansOT-Regular.otf');
++    src: url('./fonts/FiraSans-Regular.otf');
      font-weight: normal;
      font-style: normal;
  }
@@ -51,7 +51,7 @@ index f3e6bc6..843954c 100644
 -    src: url('./fonts/FiraSans-Light.eot?#iefix') format('embedded-opentype'),
 -         url('./fonts/FiraSans-Light.woff') format('woff'),
 -         url('./fonts/FiraSans-Light.ttf') format('truetype');
-+    src: url('./fonts/FiraSansOT-Light.otf');
++    src: url('./fonts/FiraSans-Light.otf');
      font-weight: normal;
      font-style: normal;
  }
diff --git a/kosmtik.spec b/kosmtik.spec
index 6d0810d..c3a3f9c 100644
--- a/kosmtik.spec
+++ b/kosmtik.spec
@@ -1,6 +1,6 @@
 Name:           kosmtik
 Version:        0.0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Make maps with OpenStreetMap and Mapnik
 
 License:        WTFPL
@@ -16,8 +16,8 @@ BuildArch:      noarch
 ExclusiveArch:  %{nodejs_arches} noarch
 
 Requires:       font(dejavusans)
-Requires:       font(firasansot)
-Requires:       font(firasansotlight)
+Requires:       font(firasans)
+Requires:       font(firasanslight)
 
 BuildRequires:  nodejs-packaging
 
@@ -73,9 +73,9 @@ pushd src
 popd
 mkdir -p %{buildroot}%{_datadir}/kosmtik/front/fonts
 ln -s %{_datadir}/fonts/dejavu/DejaVuSans.ttf %{buildroot}%{_datadir}/kosmtik/front/fonts
-ln -s %{_datadir}/fonts/mozilla-fira/FiraSansOT-Bold.otf %{buildroot}%{_datadir}/kosmtik/front/fonts
-ln -s %{_datadir}/fonts/mozilla-fira/FiraSansOT-Light.otf %{buildroot}%{_datadir}/kosmtik/front/fonts
-ln -s %{_datadir}/fonts/mozilla-fira/FiraSansOT-Regular.otf %{buildroot}%{_datadir}/kosmtik/front/fonts
+ln -s %{_datadir}/fonts/mozilla-fira/FiraSans-Bold.otf %{buildroot}%{_datadir}/kosmtik/front/fonts
+ln -s %{_datadir}/fonts/mozilla-fira/FiraSans-Light.otf %{buildroot}%{_datadir}/kosmtik/front/fonts
+ln -s %{_datadir}/fonts/mozilla-fira/FiraSans-Regular.otf %{buildroot}%{_datadir}/kosmtik/front/fonts
 ln -s %{_datadir}/kosmtik/front/fonts %{buildroot}%{nodejs_sitelib}/kosmtik/src/front
 mkdir -p %{buildroot}%{_bindir}
 ln -s %{nodejs_sitelib}/kosmtik/index.js %{buildroot}%{_bindir}/kosmtik
@@ -95,6 +95,9 @@ ln -s %{nodejs_sitelib}/kosmtik/index.js %{buildroot}%{_bindir}/kosmtik
 
 
 %changelog
+* Tue Dec  9 2014 Tom Hughes <tom at compton.nu> - 0.0.9-3
+- Update for mozilla-fira-sans 3.111
+
 * Mon Dec  8 2014 Tom Hughes <tom at compton.nu> - 0.0.9-2
 - Remove fonts from package
 - Move non-js files to %%{_datadir}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kosmtik.git/commit/?h=f21&id=448fbd917ca346eed52e384ceb0e07cb383e1e09