From 7ed8725d0f8ab877d993a066442b7d74e0efdb88 Mon Sep 17 00:00:00 2001
From: Alain Reguera Delgado <al@centos.org.cu>
Date: Oct 22 2013 03:05:48 +0000
Subject: Update design modules of kspalsh for centos-5 distribution.


- Previously, ksplash design models were using separate configuration
  files for describing image production and image branding. This
  update changes the render.conf.tpl file to integrate both image
  production and image branding in just one file.

- Previously, render.conf.tpl file was using "direct" rendition type.
  This type of rendition was renamed to "images" making any direct
  rendition to be unrecognized. This update changes render.conf.tpl to
  use "images" rendition type instead of "direct" rendition type.

---

diff --git a/Artworks/Themes/Models/Distro/5/Ksplash/brands.conf b/Artworks/Themes/Models/Distro/5/Ksplash/brands.conf
deleted file mode 100644
index 69665aa..0000000
--- a/Artworks/Themes/Models/Distro/5/Ksplash/brands.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# branding.conf -- This file controls the position of The CentOS
-# Project branding information, when images are produced through the
-# `render' functionality of the `centos-art.sh' script, and the
-# `--with-brands' option is provided.
-# -----------------------------------------------------------------------
-# $Id$
-# -----------------------------------------------------------------------
-
-[types]
-
-splash_top.svgz         = "Types/Default/ffffff/ffffff-0/24/centos.png:x24+10+189"
-splash_top.svgz         = "Types/Numbers/ffffff/ffffff-0/48/5.png:x48+150+165"
-
-[symbols]
-
-splash_top.svgz         = "Symbols/Default/ffffff/ffffff-0/48/centos.png:x48+10+10"
diff --git a/Artworks/Themes/Models/Distro/5/Ksplash/images.conf b/Artworks/Themes/Models/Distro/5/Ksplash/images.conf
deleted file mode 100644
index e69de29..0000000
--- a/Artworks/Themes/Models/Distro/5/Ksplash/images.conf
+++ /dev/null
diff --git a/Artworks/Themes/Models/Distro/5/Ksplash/render.conf.sh b/Artworks/Themes/Models/Distro/5/Ksplash/render.conf.sh
deleted file mode 100644
index 652fb0a..0000000
--- a/Artworks/Themes/Models/Distro/5/Ksplash/render.conf.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-[splash_active_bar.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_active_bar.svgz"
-render-flow     = "base"
-
-[splash_bottom.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_bottom.svgz"
-render-flow     = "base"
-
-[splash_inactive_bar.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_inactive_bar.svgz"
-render-flow     = "base"
-
-[splash_top.png]
-render-type     = "svg"
-render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_top.svgz"
-render-flow     = "base"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Images/ffffff/ffffff-0/24/centos.png:x24+10+189"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Images/ffffff/ffffff-0/48/5.png:x48+150+165"
-brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Images/ffffff/ffffff-0/48/centos.png:x48+10+10"
-
-[Preview.png]
-render-type     = "direct"
-render-from     = "splash_top.png"
-render-from     = "splash_active_bar.png"
-render-from     = "splash_bottom.png"
-command         = "/usr/bin/convert -append"
-
-[ksplash.tar.gz]
-render-type     = "archive"
-render-from     = "splash_top.png"
-render-from     = "splash_active_bar.png"
-render-from     = "splash_bottom.png"
-render-from     = "Preview.png
-command         = "/bin/tar -czf"
diff --git a/Artworks/Themes/Models/Distro/5/Ksplash/render.conf.tpl b/Artworks/Themes/Models/Distro/5/Ksplash/render.conf.tpl
new file mode 100644
index 0000000..759faec
--- /dev/null
+++ b/Artworks/Themes/Models/Distro/5/Ksplash/render.conf.tpl
@@ -0,0 +1,37 @@
+[splash_active_bar.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_active_bar.svgz"
+render-flow     = "base"
+
+[splash_bottom.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_bottom.svgz"
+render-flow     = "base"
+
+[splash_inactive_bar.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_inactive_bar.svgz"
+render-flow     = "base"
+
+[splash_top.png]
+render-type     = "svg"
+render-from     = "${TCAR_BASEDIR}/Artworks/Themes/Models/Distro/5/Ksplash/splash_top.svgz"
+render-flow     = "base"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Default/Images/ffffff/ffffff-0/24/centos.png:x24+10+189"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Types/Numbers/Images/ffffff/ffffff-0/48/5.png:x48+150+165"
+brand           = "${TCAR_BASEDIR}/Artworks/Brands/Symbols/Default/Images/ffffff/ffffff-0/48/centos.png:x48+10+10"
+
+[Preview.png]
+render-type     = "images"
+render-from     = "splash_top.png"
+render-from     = "splash_active_bar.png"
+render-from     = "splash_bottom.png"
+command         = "/usr/bin/convert -append"
+
+[ksplash.tar.gz]
+render-type     = "archive"
+render-from     = "splash_top.png"
+render-from     = "splash_active_bar.png"
+render-from     = "splash_bottom.png"
+render-from     = "Preview.png
+command         = "/bin/tar -czf"