diff --git a/.gitignore b/.gitignore
index 6bf3bb4..d2de943 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/noto-aae16d0cd626.zip
/noto-762640379a51.zip
/noto-d47480343178.zip
+/v2015-09-29-license-adobe.zip
diff --git a/66-google-noto-nastaliq-urdu.conf b/66-google-noto-nastaliq-urdu.conf
new file mode 100644
index 0000000..50ef260
--- /dev/null
+++ b/66-google-noto-nastaliq-urdu.conf
@@ -0,0 +1,22 @@
+
+
+
+
+
+ ur
+
+
+ cursive
+
+
+ Noto Nastaliq Urdu
+
+
+
+
+ Noto Nastaliq Urdu
+
+ cursive
+
+
+
diff --git a/66-google-noto-sans-tibetan.conf b/66-google-noto-sans-tibetan.conf
new file mode 100644
index 0000000..d5ee5cd
--- /dev/null
+++ b/66-google-noto-sans-tibetan.conf
@@ -0,0 +1,34 @@
+
+
+
+
+
+ bo
+
+
+ sans-serif
+
+
+ Noto Sans Tibetan
+
+
+
+
+
+ dz
+
+
+ sans-serif
+
+
+ Noto Sans Tibetan
+
+
+
+
+ Noto Sans Tibetan
+
+ sans-serif
+
+
+
diff --git a/google-noto-fonts.spec b/google-noto-fonts.spec
index de57256..6cb9c4b 100644
--- a/google-noto-fonts.spec
+++ b/google-noto-fonts.spec
@@ -6,17 +6,18 @@ between multiple scripts. Noto family supports almost all scripts available\
in Unicode.\
%{nil}
-%global git d47480343178
+%global date 2015-09-29
Name: %{fontname}-fonts
-Version: 20150417
-Release: 4%{?dist}
+Version: 20150929
+Release: 1%{?dist}
Summary: Hinted and Non Hinted OpenType fonts for Unicode scripts
+Group: User Interface/X
License: ASL 2.0
-URL: https://code.google.com/p/noto
+URL: https://github.com/googlei18n/noto-fonts/
# downloaded from https://code.google.com/p/noto/source/list -> download [zip]
# (NB the download [tar.gz] file seems to have broken headers)
-Source0: noto-%{git}.zip
+Source0: https://github.com/googlei18n/noto-fonts/archive/v%{date}-license-adobe.zip
Source2: %{fontconf}-sans.conf
Source3: %{fontconf}-sans-armenian.conf
Source4: %{fontconf}-sans-avestan.conf
@@ -125,14 +126,10 @@ Source106: %{fontconf}-sans-yi.conf
Source107: %{fontconf}-sans-tagbanwa.conf
Source108: %{fontconf}-sans-thaana.conf
-Source150: %{fontconf}-sans-simplified-chinese.conf
-Source151: %{fontconf}-sans-traditional-chinese.conf
-Source152: %{fontconf}-sans-japanese.conf
-Source153: %{fontconf}-sans-korean.conf
-Source154: %{fontconf}-sans-cjk.conf
-Source155: %{fontconf}-color-emoji.conf
Source156: %{fontconf}-sans-oriya.conf
Source157: %{fontconf}-sans-oriya-ui.conf
+Source158: %{fontconf}-nastaliq-urdu.conf
+Source159: %{fontconf}-sans-tibetan.conf
# Add appstream metadata files
Source200: %{fontname}.metainfo.xml
@@ -140,11 +137,6 @@ Source200: %{fontname}.metainfo.xml
BuildArch: noarch
BuildRequires: fontforge >= 20080429
BuildRequires: fontpackages-devel
-BuildRequires: fonttools >= 2.5
-## As nototools are python2 scripts, we need to install py2 fonttools
-BuildRequires: python2-fonttools
-BuildRequires: optipng
-BuildRequires: cairo-devel
Requires: fontpackages-filesystem
%description
@@ -213,7 +205,6 @@ fi\
%notopkg Sans Carian
%notopkg Sans Cham
%notopkg Sans Cherokee
-%notopkg -c Sans CJK
%notopkg Sans Coptic
%notopkg Sans Cuneiform
%notopkg Sans Cypriot
@@ -234,7 +225,6 @@ fi\
%notopkg Sans Imperial Aramaic
%notopkg Sans Inscriptional Pahlavi
%notopkg Sans Inscriptional Parthian
-%notopkg -a SansJP Sans Japanese
%notopkg Sans Javanese
%notopkg Sans Kaithi
%notopkg Sans Kannada
@@ -243,7 +233,6 @@ fi\
%notopkg Sans Kharoshthi
%notopkg Sans Khmer
%notopkg Sans Khmer UI
-%notopkg -a SansKR Sans Korean
%notopkg Sans Lao
%notopkg Sans Lao UI
%notopkg Sans Lepcha
@@ -275,7 +264,6 @@ fi\
%notopkg Sans Shavian
%notopkg Sans Samaritan
%notopkg Sans Saurashtra
-%notopkg -a SansSC Sans Simplified Chinese
%notopkg Sans Sinhala
%notopkg Sans Sundanese
%notopkg Sans Syloti Nagri
@@ -296,7 +284,6 @@ fi\
%notopkg Sans Thai
%notopkg Sans Thai UI
%notopkg Sans Tifinagh
-%notopkg -a SansTC Sans Traditional Chinese
%notopkg Sans Ugaritic
%notopkg Sans Vai
%notopkg Sans Yi
@@ -306,32 +293,27 @@ fi\
%notopkg Serif Khmer
%notopkg Serif Lao
%notopkg Serif Thai
-%notopkg Color Emoji
%notopkg Sans Oriya
%notopkg Sans Oriya UI
-
+%notopkg Sans Tibetan
+%notopkg Nastaliq Urdu
%prep
-%setup -q -n noto-%{git}
+%setup -q -n noto-fonts-2015-09-29-license-adobe
%build
-cd color_emoji
-env PYTHONPATH=.. make %{?_smp_mflags}
%install
install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p fonts/individual/unhinted/Noto*.ttf %{buildroot}%{_fontdir}
-install -m 0644 -p fonts/individual/hinted/Noto*.ttf %{buildroot}%{_fontdir}
-install -m 0644 -p color_emoji/NotoColorEmoji.ttf %{buildroot}%{_fontdir}/NotoColorEmoji-Regular.ttf
+install -m 0644 -p unhinted/Noto*.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p hinted/Noto*.ttf %{buildroot}%{_fontdir}
-# for cjk fonts
-install -m 0644 -p third_party/noto_cjk/NotoSans{JP,KR,SC,TC}*.otf %{buildroot}%{_fontdir}
-install -m 0644 -p third_party/noto_cjk/NotoSansCJK-*.ttc %{buildroot}%{_fontdir}
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
%{buildroot}%{_fontconfig_confdir}
+
# Add appstream metadata
install -Dm 0644 -p %{SOURCE200} \
%{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
@@ -341,15 +323,15 @@ for f in \
sans sans-armenian sans-avestan sans-balinese sans-bamum \
sans-batak sans-bengali sans-bengali-ui sans-brahmi \
sans-buginese sans-buhid sans-canadian-aboriginal sans-carian \
- sans-cham sans-cherokee sans-cjk sans-coptic sans-cuneiform \
+ sans-cham sans-cherokee sans-coptic sans-cuneiform \
sans-cypriot sans-deseret sans-devanagari sans-devanagari-ui \
sans-egyptian-hieroglyphs sans-ethiopic sans-georgian \
sans-glagolitic sans-gothic sans-gujarati sans-gujarati-ui \
sans-gurmukhi sans-gurmukhi-ui sans-hanunoo sans-hebrew \
sans-imperial-aramaic sans-inscriptional-pahlavi \
- sans-inscriptional-parthian sans-japanese sans-javanese \
+ sans-inscriptional-parthian sans-javanese \
sans-kaithi sans-kannada sans-kannada-ui sans-kayah-li \
- sans-kharoshthi sans-khmer sans-khmer-ui sans-korean sans-lao \
+ sans-kharoshthi sans-khmer sans-khmer-ui sans-lao \
sans-lao-ui sans-lepcha sans-limbu sans-linear-b sans-lisu \
sans-lycian sans-lydian sans-malayalam sans-malayalam-ui \
sans-mandaic sans-meetei-mayek sans-mongolian sans-myanmar \
@@ -357,16 +339,15 @@ for f in \
sans-ol-chiki sans-old-italic sans-old-persian \
sans-old-south-arabian sans-old-turkic sans-osmanya \
sans-phags-pa sans-phoenician sans-rejang sans-runic \
- sans-samaritan sans-saurashtra sans-shavian \
- sans-simplified-chinese sans-sinhala sans-sundanese \
- sans-syloti-nagri sans-symbols sans-syriac-eastern \
+ sans-samaritan sans-saurashtra sans-shavian sans-sinhala \
+ sans-sundanese sans-syloti-nagri sans-symbols sans-syriac-eastern \
sans-syriac-estrangela sans-syriac-western sans-tagalog \
sans-tagbanwa sans-tai-le sans-tai-tham sans-tai-viet \
sans-tamil sans-tamil-ui sans-telugu sans-telugu-ui \
sans-thaana sans-thai sans-thai-ui sans-tifinagh \
- sans-traditional-chinese sans-ugaritic sans-ui sans-vai sans-yi \
- serif serif-armenian serif-georgian serif-khmer serif-lao serif-thai color-emoji \
- sans-oriya sans-oriya-ui \
+ sans-ugaritic sans-ui sans-vai sans-yi \
+ serif serif-armenian serif-georgian serif-khmer serif-lao serif-thai \
+ sans-oriya sans-oriya-ui sans-tibetan nastaliq-urdu \
; do
install -m 0644 -p %{_sourcedir}/%{fontconf}-$f.conf \
%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-$f.conf
@@ -388,12 +369,20 @@ done
%files common
-%license LICENSE
-%doc AUTHORS CONTRIBUTORS
+%license hinted/LICENSE hinted/COPYING
+%doc README.md FAQ.md
%{_datadir}/appdata/%{fontname}.metainfo.xml
%changelog
+* Thu Apr 28 2016 Pravin Satpute - 20150929-1
+- Resolves #1269404 - Update to new git release 20150929
+- Upstream divided google-noto-fonts package into noto-cjk-font and noto-emoji
+- Removed packages: google-noto-color-emoji-fonts, google-noto-sans (cjk-fonts,
+- japanese-fonts, simplified-chinese-fonts and traditional-chinese-fonts)
+- Replaced by google-noto-cjk-fonts and google-noto-emoji-fonts
+- New subpackages - google-noto-nastaliq-urdu-fonts and google-noto-sans-tibetan-fonts
+
* Thu Feb 04 2016 Parag Nemade - 20150417-4
- Fix for python2 fonttools
diff --git a/sources b/sources
index 404e772..fe692eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24994ad24fa3b9c9e6b9f4b8a7dca0cf noto-d47480343178.zip
+4e0e7b5221b1bbf93731d85ee3396f89 v2015-09-29-license-adobe.zip