[fedora-productimg-cloud] merge changes in from f21

[Matthew Miller]

commit fb3091c379d80fd03ae034d2d2c76ccc7c7a15bf
Author: Matthew Miller <mattdm at mattdm.org>
Date:   Thu Nov 20 15:22:05 2014 -0500

    merge changes in from f21

 anaconda-gtk.css             |   63 ++++++++++++++++++++++++++++++++++++++++++
 fedora-productimg-cloud.spec |   31 ++++++++++++++++----
 2 files changed, 88 insertions(+), 6 deletions(-)
---
diff --git a/anaconda-gtk.css b/anaconda-gtk.css
new file mode 100644
index 0000000..3928ad5
--- /dev/null
+++ b/anaconda-gtk.css
@@ -0,0 +1,63 @@
+ at define-color fedora #2f4265;
+
+/* logo and sidebar classes for Fedora */
+
+/* The sidebar consists of three parts: a background, a logo, and a product logo,
+ * rendered in that order. The product logo is empty by default and is intended
+ * to be overridden by a stylesheet in product.img.
+ */
+.logo-sidebar {
+    background-image: url('/usr/share/anaconda/pixmaps/sidebar-bg.png');
+    background-color: @fedora;
+    background-repeat: no-repeat;
+}
+
+/* Add a logo to the sidebar */
+.logo {
+    background-image: url('/usr/share/anaconda/pixmaps/sidebar-logo.png');
+    background-position: 50% 20px;
+    background-repeat: no-repeat;
+    background-color: transparent;
+}
+
+/* This is a placeholder to be filled by a product-specific logo. */
+.product-logo {
+    background-image: none;
+    background-color: transparent;
+}
+
+AnacondaSpokeWindow #nav-box {
+    background-color: @fedora;
+    background-image: url('/usr/share/anaconda/pixmaps/topbar-bg.png');
+    background-repeat: no-repeat;
+    color: white;
+}
+
+/* Remove the box-shadow from buttons in the nav-box because it adds a white stripe
+ * below the buttons and makes them look dumb */
+AnacondaSpokeWindow #nav-box GtkButton {
+    box-shadow: none;
+}
+
+
+/* Change the sidebar background color */
+.logo-sidebar {
+  background-color: #006eb4;
+}
+
+AnacondaSpokeWindow #nav-box {
+  background-color: #006eb4;
+}
+
+/* Move the Fedora logo to the bottom */
+.logo {
+    background-position: 50% 90%;
+}
+
+/* Add the product logo at the top */
+.product-logo {
+    background-image: url('/usr/share/anaconda/pixmaps/sidebar-logo_flavor.png');
+    background-position: 12px 10.5em;
+    background-repeat: no-repeat;
+}
+
diff --git a/fedora-productimg-cloud.spec b/fedora-productimg-cloud.spec
index cd8ed82..fcc31a6 100644
--- a/fedora-productimg-cloud.spec
+++ b/fedora-productimg-cloud.spec
@@ -3,15 +3,19 @@
 
 Name:           fedora-productimg-cloud
 Version:        22
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Installer branding and configuration for Fedora Cloud
 
 # Copyright and related rights waived via CC0
 # http://creativecommons.org/publicdomain/zero/1.0/
 License:        CC0
 
+Source0:        anaconda-gtk.css
+
 BuildArch:      noarch
 
+BuildRequires:  cpio, findutils, xz
+
 Conflicts:      fedora-productimg-workstation, fedora-productimg-server
 
 %description
@@ -27,21 +31,36 @@ is not useful on an installed system.
 
 install -m 755 -d %{buildroot}%{pixmaptarget}
 
-for image in \
-  sidebar-bg.png sidebar-logo.png topbar-bg.png
-do
- ln -sf %{pixmapsource}/$image %{buildroot}%{pixmaptarget}
-done
+install -m 644 %{SOURCE0} %{buildroot}%{pixmaptarget}/../
+
+ln -sf %{pixmapsource}/sidebar-bg.png %{buildroot}%{pixmaptarget}
+ln -sf %{pixmapsource}/topbar-bg.png %{buildroot}%{pixmaptarget}
+
+# note filename change with this one
+ln -sf %{pixmapsource}/sidebar-logo.png %{buildroot}%{pixmaptarget}/sidebar-logo_flavor.png
+
+install -m 755 -d %{buildroot}%{_datadir}/fedora-productimg
+
+find %{buildroot}%{pixmaptarget} -depth -printf '%P\0' | \
+   cpio --null --quiet -H newc -o | \
+   xz -9 > \
+   %{buildroot}%{_datadir}/fedora-productimg/product.img
 
 
 %files
 %dir %{_datadir}/lorax/product/usr/share/anaconda
+%{_datadir}/lorax/product/usr/share/anaconda/anaconda-gtk.css
 %dir %{_datadir}/lorax/product/usr/share
 %dir %{_datadir}/lorax/product/usr
 %dir %{pixmaptarget}
 %{pixmaptarget}/*.png
+%dir %{_datadir}/fedora-productimg
+%{_datadir}/fedora-productimg/product.img
 
 %changelog
+* Thu Nov 20 2014 Matthew Miller <mattdm at fedoraproject.org> 22-3
+- merge changes in from f21
+
 * Fri Nov  7 2014 Matthew Miller <mattdm at fedoraproject.org> 22-1
 - bump to 22 for rawhide