[fedora-logos/f20] update to 21.0.1, make arch specific, add lang specific rnotes

[Tom Callaway]

commit 14f802e75c53096a3c126ea4e60e03f60f37ad9a
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Nov 19 14:58:45 2013 -0500

    update to 21.0.1, make arch specific, add lang specific rnotes

 .gitignore        |    1 +
 fedora-logos.spec |   29 ++++++++++++++++++++++-------
 sources           |    2 +-
 3 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a613097..0200c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ fedora-logos-13.0.3.tar.bz2
 /fedora-logos-19.0.1.tar.bz2
 /fedora-logos-19.0.3.tar.bz2
 /fedora-logos-19.0.4.tar.bz2
+/fedora-logos-21.0.1.tar.bz2
diff --git a/fedora-logos.spec b/fedora-logos.spec
index d45babe..5637ceb 100644
--- a/fedora-logos.spec
+++ b/fedora-logos.spec
@@ -2,14 +2,12 @@
 
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
-Version: 19.0.4
-Release: 4%{?dist}
+Version: 21.0.1
+Release: 1%{?dist}
 Group: System Environment/Base
 URL: http://git.fedorahosted.org/git/fedora-logos.git/
 Source0: https://fedorahosted.org/releases/f/e/fedora-logos/fedora-logos-%{version}.tar.bz2
 License: Licensed only for approved usage, see COPYING for details. 
-
-BuildArch: noarch
 Obsoletes: redhat-logos
 Obsoletes: gnome-logos
 Provides: redhat-logos = %{version}-%{release}
@@ -19,7 +17,9 @@ Conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 Conflicts: redhat-artwork <= 5.0.5
 # For splashtolss.sh
+%if %{_arch} == x86_64 || %{_arch} == i686
 BuildRequires: syslinux-perl, netpbm-progs
+%endif
 Requires(post): coreutils
 BuildRequires: hardlink
 # For _kde4_* macros:
@@ -44,6 +44,8 @@ redistribution of this package and its contents.
 
 %package httpd
 Summary: Fedora-related icons and pictures used by httpd
+Provides: system-logos-httpd = %{version}-%{release}
+BuildArch: noarch
 
 %description httpd
 The fedora-logos-httpd package contains image files which incorporate the
@@ -96,10 +98,9 @@ for i in pixmaps/* ; do
   install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
 done
 
-# when we get translated rnotes, I'll need to rework this, but this will do for now
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/anaconda/pixmaps/rnotes/en
 for i in rnotes/* ; do
-  install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/anaconda/pixmaps/rnotes/en
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/anaconda/pixmaps/$i
+  install -p -m 644 $i/* $RPM_BUILD_ROOT%{_datadir}/anaconda/pixmaps/$i
 done
 
 # The hal rnote is a placeholder. "the HAL banner is inappropriate and must die"
@@ -144,6 +145,9 @@ install -p -m 644 icons/hicolor/scalable/apps/xfce4_xicon1.svg $RPM_BUILD_ROOT%{
 install -p -m 644 icons/hicolor/scalable/apps/fedora-logo-icon.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/start-here.svg
 
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
+%if %{_arch} == x86_64 || %{_arch} == i686
+(cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install-lss)
+%endif
 
 for i in 16 22 24 32 36 48 96 256 ; do
   mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/${i}x${i}/places
@@ -205,7 +209,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
 %{_datadir}/pixmaps/*
 %exclude %{_datadir}/pixmaps/poweredby.png
 %{_datadir}/anaconda/pixmaps/*
+%if %{_arch} == x86_64 || %{_arch} == i686
 %{_datadir}/anaconda/boot/splash.lss
+%endif
 %{_datadir}/anaconda/boot/syslinux-splash.png
 %{_datadir}/anaconda/boot/splash.png
 %{_datadir}/icons/hicolor/*/apps/*
@@ -297,6 +303,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
 %{_datadir}/pixmaps/poweredby.png
 
 %changelog
+* Tue Nov 19 2013 Tom Callaway <spot at fedoraproject.org> - 21.0.1-1
+- make arch specific package so that it always builds
+- add lang specific rnotes
+
+* Wed Oct  9 2013 Tom Callaway <spot at fedoraproject.org> - 21.0.0-1
+- update to 21.0.0
+- arch conditionalize the lss magic, cannot use ifarch because it checks
+  _target_cpu, not _arch, and _target_cpu evals to "noarch" here
+
 * Wed Oct  9 2013 Tom Callaway <spot at fedoraproject.org> - 19.0.4-4
 - subpackage poweredby.png to minimize httpd footprint
 
diff --git a/sources b/sources
index c504496..99d8171 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96e50ea9a1d403dcf2b5403d755865ef  fedora-logos-19.0.4.tar.bz2
+f3b0b7d3891c6e512d9fd4bb033013d0  fedora-logos-21.0.1.tar.bz2