[google-roboto-fonts] revert the previous "update"

[David Tardon]

commit 9aac9d42876313bef07a6ccbcc6515ac1eeb3725
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 23 16:51:22 2014 +0100

    revert the previous "update"
    
    This reverts commit 8a6ce4e69ef7f4e9c78a33512ecf9005fd8d5648.
    This reverts commit 6a08d1a623106a11a9c7e11abae12d07f418b200.

 .gitignore               |    1 -
 LICENSE.txt              |  202 ----------------------------------------------
 google-roboto-fonts.spec |   45 ++++++-----
 sources                  |    2 +-
 4 files changed, 26 insertions(+), 224 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 81acdb7..c3e82c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 /roboto-1.2.zip
-/RobotoTTF.zip
diff --git a/google-roboto-fonts.spec b/google-roboto-fonts.spec
index 130416e..ca492b5 100644
--- a/google-roboto-fonts.spec
+++ b/google-roboto-fonts.spec
@@ -2,31 +2,27 @@
 %global fontname google-roboto
 
 Name: google-roboto-fonts
-# No idea what version this is supposed to be. The last versioned tarball from
-# http://developer.android.com/design/style/typography.html was version 1.2,
-# so I will just continue using that version.
 Version: 1.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Google Roboto fonts
 
 # Only the metainfo.xml files are CC0
 License: ASL 2.0 and CC0
 URL: https://www.google.com/fonts/specimen/Roboto
-# Oh, yeah... Thank you for the predictable download URL, Google! And
-# I really do not want versioned tarball, because I really love to play
-# the "find if there has been a new release" game...
-# Downloaded on: 2014-12-17
-Source0: http://material-design.storage.googleapis.com/publish/v_2/material_ext_publish/0B08MbvYZK1iNZGNoWmJqVEhQYTQ/RobotoTTF.zip
+Source0: http://developer.android.com/downloads/design/%{pkgname}-%{version}.zip
 Source1: 64-%{fontname}-condensed-fontconfig.conf
 Source2: 64-%{fontname}-fontconfig.conf
 Source3: %{fontname}-condensed.metainfo.xml
 Source4: %{fontname}.metainfo.xml
-Source5: LICENSE.txt
-
 BuildArch: noarch
 
+BuildRequires: dos2unix
 BuildRequires: fontpackages-devel
 
+Requires: %{fontname}-common = %{version}-%{release}
+
+%global archivename %{pkgname}-%{version}
+%global fontsrcdir Roboto_v%{version}
 %global fontconf 64-%{fontname}
 
 %description
@@ -36,19 +32,29 @@ approachable" and "emotional".
 
 %package -n %{fontname}-condensed-fonts
 Summary: Google Roboto condensed fonts
+Requires: %{fontname}-common = %{version}-%{release}
 
 %description -n %{fontname}-condensed-fonts
 Google Roboto condensed fonts.
 
+%package -n %{fontname}-common
+Summary: Common files for Google Roboto fonts
+Requires: fontpackages-filesystem
+
+%description -n %{fontname}-common
+Common files for Google Roboto fonts.
+
 %prep
 %autosetup -c -n %{name}-%{version}
+dos2unix %{fontsrcdir}/*/LICENSE.txt
 
 %build
 
 %install
 # install fonts
 install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p %{fontsrcdir}/Roboto/*.ttf %{buildroot}%{_fontdir}
+install -m 0644 -p %{fontsrcdir}/RobotoCondensed/*.ttf %{buildroot}%{_fontdir}
 
 # install fontconfig files
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
@@ -63,21 +69,20 @@ done
 install -m 0755 -d %{buildroot}%{_datadir}/appdata
 install -m 0644 -p %{SOURCE3} %{SOURCE4} %{buildroot}%{_datadir}/appdata
 
-# install license
-install -m 0755 -d %{buildroot}%{_docdir}/%{fontname}-fonts \
-                   %{buildroot}%{_docdir}/%{fontname}-condensed-fonts
-install -m 0644 -p %{SOURCE5} %{buildroot}%{_docdir}/%{fontname}-fonts/LICENSE.txt
-install -m 0644 -p %{SOURCE5} %{buildroot}%{_docdir}/%{fontname}-condensed-fonts/LICENSE.txt
-
 %_font_pkg -f %{fontconf}.conf Roboto-*.ttf
 %{_datadir}/appdata/%{fontname}.metainfo.xml
-%doc %{_docdir}/%{fontname}-fonts/LICENSE.txt
 
 %_font_pkg -n condensed -f %{fontconf}-condensed.conf RobotoCondensed-*.ttf
 %{_datadir}/appdata/%{fontname}-condensed.metainfo.xml
-%doc %{_docdir}/%{fontname}-condensed-fonts/LICENSE.txt
+
+%files -n %{fontname}-common
+%doc %{fontsrcdir}/Roboto/LICENSE.txt
+%doc %{fontsrcdir}/RobotoSpecimenBook.pdf
 
 %changelog
+* Tue Dec 23 2014 David Tardon <dtardon at redhat.com> - 1.2-8
+- revert the previous "update"
+
 * Tue Dec 23 2014 David Tardon <dtardon at redhat.com> - 1.2-7
 - drop obsolete requires
 
diff --git a/sources b/sources
index 89200a8..e640655 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-844bb84ed6fab4648c4bda35acf432bd  RobotoTTF.zip
+45bfbcd71a74d73c6d2c97994abb7e00  roboto-1.2.zip